android_external_chromium-webview_patches/0006-disable-WebView-variations-support.patch at main · PixelBuildsROM/android_external_chromium-webview_patches · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
From b09c32a700368ea2e147e1487d04076f76e23d6b Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Thu, 10 Dec 2020 10:09:18 -0500
Subject: [PATCH 06/12] disable WebView variations support

---
 .../android/webview/chromium/WebViewChromiumAwInit.java    | 7 -------
 .../webview/chromium/WebViewChromiumFactoryProvider.java   | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
index 7ba235362eec5..73994bf7c5440 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
@@ -678,13 +678,6 @@ public class WebViewChromiumAwInit {
                     }

                     AwBrowserProcess.configureChildProcessLauncher();
-
-                    // finishVariationsInitLocked() must precede native initialization so
-                    // the seed is available when AwFeatureListCreator::SetUpFieldTrials()
-                    // runs.
-                    if (!FastVariationsSeedSafeModeAction.hasRun()) {
-                        finishVariationsInitLocked();
-                    }
                 });

         addBrowserProcessStartTasksToQueue(
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index a1dd1258a92ae..e9cecc668cf99 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -677,10 +677,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
             // This must happen after pref value has been read and SafeMode setup has completed.
             setupStartupTaskExperiments(androidXConfig);

-            if (!FastVariationsSeedSafeModeAction.hasRun()) {
-                mAwInit.startVariationsInit();
-            }
-
             if (WebViewCachedFlags.get()
                     .isCachedFeatureEnabled(AwFeatures.WEBVIEW_MOVE_WORK_TO_PROVIDER_INIT)) {
                 mAwInit.runNonUiThreadCapableStartupTasks();
--
2.43.0