Merge changes I100dac6b,Ibbecac7e (037e758d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/webkit/SystemImpl.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -294,6 +294,11 @@ public class SystemImpl implements SystemInterface {
		WebViewZygote.setMultiprocessEnabled(enableMultiProcess);
		}

		@Override
		public boolean isMultiProcessDefaultEnabled() {
		return true;
		}

		// flags declaring we want extra info from the package manager for webview providers
		private final static int PACKAGE_FLAGS = PackageManager.GET_META_DATA
		\| PackageManager.GET_SIGNATURES \| PackageManager.MATCH_DEBUG_TRIAGED_MISSING

services/core/java/com/android/server/webkit/SystemInterface.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -64,4 +64,5 @@ public interface SystemInterface {
		public int getMultiProcessSetting(Context context);
		public void setMultiProcessSetting(Context context, int value);
		public void notifyZygote(boolean enableMultiProcess);
		public boolean isMultiProcessDefaultEnabled();
		}

services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java

+21 −2

Original line number	Diff line number	Diff line
		@@ -240,12 +240,31 @@ public class WebViewUpdateServiceImpl {
		}

		boolean isMultiProcessEnabled() {
		return mSystemInterface.getMultiProcessSetting(mContext) != 0;
		PackageInfo current = getCurrentWebViewPackage();
		if (current == null) return false;
		int currentVersion = current.versionCode;
		int settingValue = mSystemInterface.getMultiProcessSetting(mContext);
		if (mSystemInterface.isMultiProcessDefaultEnabled()) {
		// Multiprocess should be enabled unless the user has turned it off manually for this
		// version or newer, as we want to re-enable it when it's updated to get fresh
		// bug reports.
		return settingValue > -currentVersion;
		} else {
		// Multiprocess should not be enabled, unless the user has turned it on manually for
		// any version.
		return settingValue > 0;
		}
		}

		void enableMultiProcess(boolean enable) {
		// The value we store for the setting is the version code of the current package, if it's
		// enabled, or the negation of the version code of the current package, if it's disabled.
		// Users who have a setting from before this scheme was implemented will have it set to 0 or
		// 1 instead.
		PackageInfo current = getCurrentWebViewPackage();
		mSystemInterface.setMultiProcessSetting(mContext, enable ? 1 : 0);
		int currentVersion = current != null ? current.versionCode : 1;
		mSystemInterface.setMultiProcessSetting(mContext,
		enable ? currentVersion : -currentVersion);
		mSystemInterface.notifyZygote(enable);
		if (current != null) {
		mSystemInterface.killPackageDependents(current.packageName);

services/tests/servicestests/src/com/android/server/webkit/TestSystemImpl.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -38,16 +38,18 @@ public class TestSystemImpl implements SystemInterface {
		private final int mNumRelros;
		private final boolean mIsDebuggable;
		private int mMultiProcessSetting;
		private final boolean mMultiProcessDefault;

		public static final int PRIMARY_USER_ID = 0;

		public TestSystemImpl(WebViewProviderInfo[] packageConfigs, boolean fallbackLogicEnabled,
		int numRelros, boolean isDebuggable) {
		int numRelros, boolean isDebuggable, boolean multiProcessDefault) {
		mPackageConfigs = packageConfigs;
		mFallbackLogicEnabled = fallbackLogicEnabled;
		mNumRelros = numRelros;
		mIsDebuggable = isDebuggable;
		mUsers.add(PRIMARY_USER_ID);
		mMultiProcessDefault = multiProcessDefault;
		}

		public void addUser(int userId) {
		@@ -187,4 +189,9 @@ public class TestSystemImpl implements SystemInterface {

		@Override
		public void notifyZygote(boolean enableMultiProcess) {}

		@Override
		public boolean isMultiProcessDefaultEnabled() {
		return mMultiProcessDefault;
		}
		}

services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java

+94 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.server.webkit;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertTrue;

		import android.content.Context;
		import android.content.pm.ApplicationInfo;
		@@ -84,8 +85,15 @@ public class WebViewUpdateServiceTest {

		private void setupWithPackages(WebViewProviderInfo[] packages,
		boolean fallbackLogicEnabled, int numRelros, boolean isDebuggable) {
		setupWithPackages(packages, fallbackLogicEnabled, numRelros, isDebuggable,
		false /* multiProcessDefault */);
		}

		private void setupWithPackages(WebViewProviderInfo[] packages,
		boolean fallbackLogicEnabled, int numRelros, boolean isDebuggable,
		boolean multiProcessDefault) {
		TestSystemImpl testing = new TestSystemImpl(packages, fallbackLogicEnabled, numRelros,
		isDebuggable);
		isDebuggable, multiProcessDefault);
		mTestSystemImpl = Mockito.spy(testing);
		mWebViewUpdateServiceImpl =
		new WebViewUpdateServiceImpl(null /Context/, mTestSystemImpl);
		@@ -1521,4 +1529,89 @@ public class WebViewUpdateServiceTest {
		assertEquals(firstPackage.versionName,
		mWebViewUpdateServiceImpl.getCurrentWebViewPackage().versionName);
		}

		@Test
		public void testMultiProcessEnabledByDefault() {
		String primaryPackage = "primary";
		WebViewProviderInfo[] packages = new WebViewProviderInfo[] {
		new WebViewProviderInfo(
		primaryPackage, "", true /* default available /, false / fallback */, null)};
		setupWithPackages(packages, true /* fallback logic enabled /, 1 / numRelros */,
		true /* debuggable /, true / multiprocess by default */);
		mTestSystemImpl.setPackageInfo(createPackageInfo(primaryPackage, true /* enabled */,
		true /* valid /, true / installed /, null / signatures */,
		10 /* lastUpdateTime/, false / not hidden /, 1000 / versionCode */,
		false /* isSystemApp */));

		runWebViewBootPreparationOnMainSync();
		checkPreparationPhasesForPackage(primaryPackage, 1 /* first preparation phase */);

		// Check it's on by default
		assertTrue(mWebViewUpdateServiceImpl.isMultiProcessEnabled());

		// Test toggling it
		mWebViewUpdateServiceImpl.enableMultiProcess(false);
		assertFalse(mWebViewUpdateServiceImpl.isMultiProcessEnabled());
		mWebViewUpdateServiceImpl.enableMultiProcess(true);
		assertTrue(mWebViewUpdateServiceImpl.isMultiProcessEnabled());

		// Disable, then upgrade provider, which should re-enable it
		mWebViewUpdateServiceImpl.enableMultiProcess(false);
		mTestSystemImpl.setPackageInfo(createPackageInfo(primaryPackage, true /* enabled */,
		true /* valid /, true / installed /, null / signatures */,
		20 /* lastUpdateTime/, false / not hidden /, 2000 / versionCode */,
		false /* isSystemApp */));
		mWebViewUpdateServiceImpl.packageStateChanged(primaryPackage,
		WebViewUpdateService.PACKAGE_ADDED_REPLACED, 0);
		checkPreparationPhasesForPackage(primaryPackage, 2);
		assertTrue(mWebViewUpdateServiceImpl.isMultiProcessEnabled());
		}

		@Test
		public void testMultiProcessDisabledByDefault() {
		String primaryPackage = "primary";
		WebViewProviderInfo[] packages = new WebViewProviderInfo[] {
		new WebViewProviderInfo(
		primaryPackage, "", true /* default available /, false / fallback */, null)};
		setupWithPackages(packages, true /* fallback logic enabled /, 1 / numRelros */,
		true /* debuggable /, false / not multiprocess by default */);
		mTestSystemImpl.setPackageInfo(createPackageInfo(primaryPackage, true /* enabled */,
		true /* valid /, true / installed /, null / signatures */,
		10 /* lastUpdateTime/, false / not hidden /, 1000 / versionCode */,
		false /* isSystemApp */));

		runWebViewBootPreparationOnMainSync();
		checkPreparationPhasesForPackage(primaryPackage, 1 /* first preparation phase */);

		// Check it's off by default
		assertFalse(mWebViewUpdateServiceImpl.isMultiProcessEnabled());

		// Test toggling it
		mWebViewUpdateServiceImpl.enableMultiProcess(true);
		assertTrue(mWebViewUpdateServiceImpl.isMultiProcessEnabled());
		mWebViewUpdateServiceImpl.enableMultiProcess(false);
		assertFalse(mWebViewUpdateServiceImpl.isMultiProcessEnabled());

		// Disable, then upgrade provider, which should not re-enable it
		mWebViewUpdateServiceImpl.enableMultiProcess(false);
		mTestSystemImpl.setPackageInfo(createPackageInfo(primaryPackage, true /* enabled */,
		true /* valid /, true / installed /, null / signatures */,
		20 /* lastUpdateTime/, false / not hidden /, 2000 / versionCode */,
		false /* isSystemApp */));
		mWebViewUpdateServiceImpl.packageStateChanged(primaryPackage,
		WebViewUpdateService.PACKAGE_ADDED_REPLACED, 0);
		checkPreparationPhasesForPackage(primaryPackage, 2);
		assertFalse(mWebViewUpdateServiceImpl.isMultiProcessEnabled());

		// Enable, then upgrade provider, which should leave it on
		mWebViewUpdateServiceImpl.enableMultiProcess(true);
		mTestSystemImpl.setPackageInfo(createPackageInfo(primaryPackage, true /* enabled */,
		true /* valid /, true / installed /, null / signatures */,
		30 /* lastUpdateTime/, false / not hidden /, 3000 / versionCode */,
		false /* isSystemApp */));
		mWebViewUpdateServiceImpl.packageStateChanged(primaryPackage,
		WebViewUpdateService.PACKAGE_ADDED_REPLACED, 0);
		checkPreparationPhasesForPackage(primaryPackage, 3);
		assertTrue(mWebViewUpdateServiceImpl.isMultiProcessEnabled());
		}
		}