commit 09989dd2ca0d9fb0539bf7efdc450fa2cf7c7c74
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 18 15:19:39 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 18 15:19:44 2017 +0000
tree 257f5f3499eb219f06054a2e72feda1555c310b5
parent 859bc9190df4b8508247fd90033e9dd64893769a
parent d86ebaa0f64e8b0dc4d00d04a4073ea21b1dd373

Merge "Delegate multiprocess flag to WebView update service."

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 49eb1b0..27ff937 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -865,20 +865,16 @@
     }
 
     private void updateWebViewMultiprocessOptions() {
-        updateSwitchPreference(mWebViewMultiprocess,
-                Settings.Global.getInt(getActivity().getContentResolver(),
-                        Settings.Global.WEBVIEW_MULTIPROCESS, 0) != 0);
+        try {
+            updateSwitchPreference(mWebViewMultiprocess,
+                                   mWebViewUpdateService.isMultiProcessEnabled());
+        } catch (RemoteException e) {
+        }
     }
 
     private void writeWebViewMultiprocessOptions() {
-        boolean value = mWebViewMultiprocess.isChecked();
-        Settings.Global.putInt(getActivity().getContentResolver(),
-                Settings.Global.WEBVIEW_MULTIPROCESS, value ? 1 : 0);
-
         try {
-            String wv_package = mWebViewUpdateService.getCurrentWebViewPackageName();
-            ActivityManager.getService().killPackageDependents(
-                    wv_package, UserHandle.USER_ALL);
+            mWebViewUpdateService.enableMultiProcess(mWebViewMultiprocess.isChecked());
         } catch (RemoteException e) {
         }
     }