Merge changes from topic "fix-policy" am: e7194bfdfc am: e2e382b125 am: 577d6b2be5 (a067a7bc) · Commits · e / os / android_frameworks_base

services/tests/servicestests/src/com/android/server/compat/CompatConfigBuilder.java

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -40,52 +40,52 @@ class CompatConfigBuilder {
	}		}

	CompatConfigBuilder addTargetSdkChangeWithId(int sdk, long id) {		CompatConfigBuilder addTargetSdkChangeWithId(int sdk, long id) {
	mChanges.add(new CompatChange(id, null, sdk, false, null));		mChanges.add(new CompatChange(id, "", sdk, false, ""));
	return this;		return this;
	}		}

	CompatConfigBuilder addTargetSdkDisabledChangeWithId(int sdk, long id) {		CompatConfigBuilder addTargetSdkDisabledChangeWithId(int sdk, long id) {
	mChanges.add(new CompatChange(id, null, sdk, true, null));		mChanges.add(new CompatChange(id, "", sdk, true, ""));
	return this;		return this;
	}		}

	CompatConfigBuilder addTargetSdkChangeWithIdAndName(int sdk, long id, String name) {		CompatConfigBuilder addTargetSdkChangeWithIdAndName(int sdk, long id, String name) {
	mChanges.add(new CompatChange(id, name, sdk, false, null));		mChanges.add(new CompatChange(id, name, sdk, false, ""));
	return this;		return this;
	}		}

	CompatConfigBuilder addTargetSdkChangeWithIdAndDescription(int sdk, long id,		CompatConfigBuilder addTargetSdkChangeWithIdAndDescription(int sdk, long id,
	String description) {		String description) {
	mChanges.add(new CompatChange(id, null, sdk, false, description));		mChanges.add(new CompatChange(id, "", sdk, false, description));
	return this;		return this;
	}		}

	CompatConfigBuilder addEnabledChangeWithId(long id) {		CompatConfigBuilder addEnabledChangeWithId(long id) {
	mChanges.add(new CompatChange(id, null, -1, false, null));		mChanges.add(new CompatChange(id, "", -1, false, ""));
	return this;		return this;
	}		}

	CompatConfigBuilder addEnabledChangeWithIdAndName(long id, String name) {		CompatConfigBuilder addEnabledChangeWithIdAndName(long id, String name) {
	mChanges.add(new CompatChange(id, name, -1, false, null));		mChanges.add(new CompatChange(id, name, -1, false, ""));
	return this;		return this;
	}		}
	CompatConfigBuilder addEnabledChangeWithIdAndDescription(long id, String description) {		CompatConfigBuilder addEnabledChangeWithIdAndDescription(long id, String description) {
	mChanges.add(new CompatChange(id, null, -1, false, description));		mChanges.add(new CompatChange(id, "", -1, false, description));
	return this;		return this;
	}		}

	CompatConfigBuilder addDisabledChangeWithId(long id) {		CompatConfigBuilder addDisabledChangeWithId(long id) {
	mChanges.add(new CompatChange(id, null, -1, true, null));		mChanges.add(new CompatChange(id, "", -1, true, ""));
	return this;		return this;
	}		}

	CompatConfigBuilder addDisabledChangeWithIdAndName(long id, String name) {		CompatConfigBuilder addDisabledChangeWithIdAndName(long id, String name) {
	mChanges.add(new CompatChange(id, name, -1, true, null));		mChanges.add(new CompatChange(id, name, -1, true, ""));
	return this;		return this;
	}		}

	CompatConfigBuilder addDisabledChangeWithIdAndDescription(long id, String description) {		CompatConfigBuilder addDisabledChangeWithIdAndDescription(long id, String description) {
	mChanges.add(new CompatChange(id, null, -1, true, description));		mChanges.add(new CompatChange(id, "", -1, true, description));
	return this;		return this;
	}		}

services/tests/servicestests/src/com/android/server/compat/CompatConfigTest.java

+168 −78

Original line number	Original line	Diff line number	Diff line
	@@ -18,10 +18,15 @@ package com.android.server.compat;

	import static com.google.common.truth.Truth.assertThat;		import static com.google.common.truth.Truth.assertThat;

			import static org.mockito.Mockito.anyInt;
			import static org.mockito.Mockito.eq;
			import static org.mockito.Mockito.mock;
	import static org.mockito.Mockito.when;		import static org.mockito.Mockito.when;
			import static org.testng.Assert.assertThrows;

	import android.content.Context;		import android.content.Context;
	import android.content.pm.ApplicationInfo;		import android.content.pm.ApplicationInfo;
			import android.content.pm.PackageManager;

	import androidx.test.runner.AndroidJUnit4;		import androidx.test.runner.AndroidJUnit4;

	@@ -45,15 +50,10 @@ public class CompatConfigTest {
	@Mock		@Mock
	private Context mContext;		private Context mContext;
	@Mock		@Mock
			PackageManager mPackageManager;
			@Mock
	private AndroidBuildClassifier mBuildClassifier;		private AndroidBuildClassifier mBuildClassifier;

	private ApplicationInfo makeAppInfo(String pName, int targetSdkVersion) {
	ApplicationInfo ai = new ApplicationInfo();
	ai.packageName = pName;
	ai.targetSdkVersion = targetSdkVersion;
	return ai;
	}

	private File createTempDir() {		private File createTempDir() {
	String base = System.getProperty("java.io.tmpdir");		String base = System.getProperty("java.io.tmpdir");
	File dir = new File(base, UUID.randomUUID().toString());		File dir = new File(base, UUID.randomUUID().toString());
	@@ -70,6 +70,7 @@ public class CompatConfigTest {
	@Before		@Before
	public void setUp() throws Exception {		public void setUp() throws Exception {
	MockitoAnnotations.initMocks(this);		MockitoAnnotations.initMocks(this);
			when(mContext.getPackageManager()).thenReturn(mPackageManager);
	// Assume userdebug/eng non-final build		// Assume userdebug/eng non-final build
	when(mBuildClassifier.isDebuggableBuild()).thenReturn(true);		when(mBuildClassifier.isDebuggableBuild()).thenReturn(true);
	when(mBuildClassifier.isFinalBuild()).thenReturn(false);		when(mBuildClassifier.isFinalBuild()).thenReturn(false);
	@@ -77,110 +78,195 @@ public class CompatConfigTest {

	@Test		@Test
	public void testUnknownChangeEnabled() throws Exception {		public void testUnknownChangeEnabled() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = new CompatConfig(mBuildClassifier, mContext);
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 1))).isTrue();		assertThat(compatConfig.isChangeEnabled(1234L, ApplicationInfoBuilder.create().build()))
			.isTrue();
	}		}

	@Test		@Test
	public void testDisabledChangeDisabled() throws Exception {		public void testDisabledChangeDisabled() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)
	pc.addChange(new CompatChange(1234L, "MY_CHANGE", -1, true, ""));		.addDisabledChangeWithId(1234L)
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 1))).isFalse();		.build();

			assertThat(compatConfig.isChangeEnabled(1234L, ApplicationInfoBuilder.create().build()))
			.isFalse();
	}		}

	@Test		@Test
	public void testTargetSdkChangeDisabled() throws Exception {		public void testTargetSdkChangeDisabled() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)
	pc.addChange(new CompatChange(1234L, "MY_CHANGE", 2, false, null));		.addTargetSdkChangeWithId(2, 1234L)
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 2))).isFalse();		.build();

			assertThat(compatConfig.isChangeEnabled(1234L,
			ApplicationInfoBuilder.create().withTargetSdk(2).build()))
			.isFalse();
	}		}

	@Test		@Test
	public void testTargetSdkChangeEnabled() throws Exception {		public void testTargetSdkChangeEnabled() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)
	pc.addChange(new CompatChange(1234L, "MY_CHANGE", 2, false, ""));		.addTargetSdkChangeWithId(2, 1234L)
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 3))).isTrue();		.build();

			assertThat(compatConfig.isChangeEnabled(1234L,
			ApplicationInfoBuilder.create().withTargetSdk(3).build())).isTrue();
	}		}

	@Test		@Test
	public void testDisabledOverrideTargetSdkChange() throws Exception {		public void testDisabledOverrideTargetSdkChange() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)
	pc.addChange(new CompatChange(1234L, "MY_CHANGE", 2, true, null));		.addTargetSdkDisabledChangeWithId(2, 1234L)
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 3))).isFalse();		.build();

			assertThat(compatConfig.isChangeEnabled(1234L,
			ApplicationInfoBuilder.create().withTargetSdk(3).build())).isFalse();
	}		}

	@Test		@Test
	public void testGetDisabledChanges() throws Exception {		public void testGetDisabledChanges() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)
	pc.addChange(new CompatChange(1234L, "MY_CHANGE", -1, true, null));		.addDisabledChangeWithId(1234L)
	pc.addChange(new CompatChange(2345L, "OTHER_CHANGE", -1, false, null));		.addEnabledChangeWithId(2345L)
	assertThat(pc.getDisabledChanges(		.build();
	makeAppInfo("com.some.package", 2))).asList().containsExactly(1234L);
			assertThat(compatConfig.getDisabledChanges(
			ApplicationInfoBuilder.create().build())).asList().containsExactly(1234L);
	}		}

	@Test		@Test
	public void testGetDisabledChangesSorted() throws Exception {		public void testGetDisabledChangesSorted() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)
	pc.addChange(new CompatChange(1234L, "MY_CHANGE", 2, true, null));		.addDisabledChangeWithId(1234L)
	pc.addChange(new CompatChange(123L, "OTHER_CHANGE", 2, true, null));		.addDisabledChangeWithId(123L)
	pc.addChange(new CompatChange(12L, "THIRD_CHANGE", 2, true, null));		.addDisabledChangeWithId(12L)
	assertThat(pc.getDisabledChanges(		.build();
	makeAppInfo("com.some.package", 2))).asList().containsExactly(12L, 123L, 1234L);
			assertThat(compatConfig.getDisabledChanges(ApplicationInfoBuilder.create().build()))
			.asList().containsExactly(12L, 123L, 1234L);
	}		}

	@Test		@Test
	public void testPackageOverrideEnabled() throws Exception {		public void testPackageOverrideEnabled() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)
	pc.addChange(new CompatChange(1234L, "MY_CHANGE", -1, true, null)); // disabled		.addDisabledChangeWithId(1234L)
	pc.addOverride(1234L, "com.some.package", true);		.build();
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 2))).isTrue();
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.other.package", 2))).isFalse();		compatConfig.addOverride(1234L, "com.some.package", true);

			assertThat(compatConfig.isChangeEnabled(1234L, ApplicationInfoBuilder.create()
			.withPackageName("com.some.package").build())).isTrue();
			assertThat(compatConfig.isChangeEnabled(1234L, ApplicationInfoBuilder.create()
			.withPackageName("com.other.package").build())).isFalse();
	}		}

	@Test		@Test
	public void testPackageOverrideDisabled() throws Exception {		public void testPackageOverrideDisabled() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)
	pc.addChange(new CompatChange(1234L, "MY_CHANGE", -1, false, null));		.addEnabledChangeWithId(1234L)
	pc.addOverride(1234L, "com.some.package", false);		.build();
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 2))).isFalse();
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.other.package", 2))).isTrue();		compatConfig.addOverride(1234L, "com.some.package", false);

			assertThat(compatConfig.isChangeEnabled(1234L, ApplicationInfoBuilder.create()
			.withPackageName("com.some.package").build())).isFalse();
			assertThat(compatConfig.isChangeEnabled(1234L, ApplicationInfoBuilder.create()
			.withPackageName("com.other.package").build())).isTrue();
	}		}

	@Test		@Test
	public void testPackageOverrideUnknownPackage() throws Exception {		public void testPackageOverrideUnknownPackage() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = new CompatConfig(mBuildClassifier, mContext);
	pc.addOverride(1234L, "com.some.package", false);
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 2))).isFalse();		compatConfig.addOverride(1234L, "com.some.package", false);
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.other.package", 2))).isTrue();
			assertThat(compatConfig.isChangeEnabled(1234L, ApplicationInfoBuilder.create()
			.withPackageName("com.some.package").build())).isFalse();
			assertThat(compatConfig.isChangeEnabled(1234L, ApplicationInfoBuilder.create()
			.withPackageName("com.other.package").build())).isTrue();
			}

			@Test
			public void testPreventAddOverride() throws Exception {
			final long changeId = 1234L;
			CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)
			.addDisabledChangeWithId(1234L)
			.build();
			ApplicationInfo applicationInfo = ApplicationInfoBuilder.create()
			.withPackageName("com.some.package")
			.build();
			PackageManager packageManager = mock(PackageManager.class);
			when(mContext.getPackageManager()).thenReturn(packageManager);
			when(packageManager.getApplicationInfo(eq("com.some.package"), anyInt()))
			.thenReturn(applicationInfo);

			// Force the validator to prevent overriding the change by using a user build.
			when(mBuildClassifier.isDebuggableBuild()).thenReturn(false);
			when(mBuildClassifier.isFinalBuild()).thenReturn(true);

			assertThrows(SecurityException.class,
			() -> compatConfig.addOverride(1234L, "com.some.package", true)
			);
			assertThat(compatConfig.isChangeEnabled(1234L, applicationInfo)).isFalse();
	}		}

	@Test		@Test
	public void testPackageOverrideUnknownChange() throws Exception {		public void testPreventRemoveOverride() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 1))).isTrue();		.addDisabledChangeWithId(1234L)
			.build();
			ApplicationInfo applicationInfo = ApplicationInfoBuilder.create()
			.withPackageName("com.some.package")
			.build();
			when(mPackageManager.getApplicationInfo(eq("com.some.package"), anyInt()))
			.thenReturn(applicationInfo);
			// Assume the override was allowed to be added.
			compatConfig.addOverride(1234L, "com.some.package", true);

			// Validator allows turning on the change.
			assertThat(compatConfig.isChangeEnabled(1234L, applicationInfo)).isTrue();

			// Reject all override attempts.
			// Force the validator to prevent overriding the change by using a user build.
			when(mBuildClassifier.isDebuggableBuild()).thenReturn(false);
			when(mBuildClassifier.isFinalBuild()).thenReturn(true);
			// Try to turn off change, but validator prevents it.
			assertThrows(SecurityException.class,
			() -> compatConfig.removeOverride(1234L, "com.some.package"));
			assertThat(compatConfig.isChangeEnabled(1234L, applicationInfo)).isTrue();
	}		}

	@Test		@Test
	public void testRemovePackageOverride() throws Exception {		public void testRemovePackageOverride() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)
	pc.addChange(new CompatChange(1234L, "MY_CHANGE", -1, false, null));		.addEnabledChangeWithId(1234L)
	pc.addOverride(1234L, "com.some.package", false);		.build();
	pc.removeOverride(1234L, "com.some.package");		ApplicationInfo applicationInfo = ApplicationInfoBuilder.create()
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 2))).isTrue();		.withPackageName("com.some.package")
			.build();

			assertThat(compatConfig.addOverride(1234L, "com.some.package", false)).isTrue();
			assertThat(compatConfig.isChangeEnabled(1234L, applicationInfo)).isFalse();

			compatConfig.removeOverride(1234L, "com.some.package");
			assertThat(compatConfig.isChangeEnabled(1234L, applicationInfo)).isTrue();
	}		}

	@Test		@Test
	public void testLookupChangeId() throws Exception {		public void testLookupChangeId() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)
	pc.addChange(new CompatChange(1234L, "MY_CHANGE", -1, false, null));		.addEnabledChangeWithIdAndName(1234L, "MY_CHANGE")
	pc.addChange(new CompatChange(2345L, "ANOTHER_CHANGE", -1, false, null));		.addEnabledChangeWithIdAndName(2345L, "MY_OTHER_CHANGE")
	assertThat(pc.lookupChangeId("MY_CHANGE")).isEqualTo(1234L);		.build();

			assertThat(compatConfig.lookupChangeId("MY_CHANGE")).isEqualTo(1234L);
	}		}

	@Test		@Test
	public void testLookupChangeIdNotPresent() throws Exception {		public void testLookupChangeIdNotPresent() throws Exception {
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		CompatConfig compatConfig = new CompatConfig(mBuildClassifier, mContext);
	assertThat(pc.lookupChangeId("MY_CHANGE")).isEqualTo(-1L);		assertThat(compatConfig.lookupChangeId("MY_CHANGE")).isEqualTo(-1L);
	}		}

	@Test		@Test
	@@ -193,14 +279,17 @@ public class CompatConfigTest {

	File dir = createTempDir();		File dir = createTempDir();
	writeToFile(dir, "platform_compat_config.xml", configXml);		writeToFile(dir, "platform_compat_config.xml", configXml);
			CompatConfig compatConfig = new CompatConfig(mBuildClassifier, mContext);
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		compatConfig.initConfigFromLib(dir);
	pc.initConfigFromLib(dir);
			assertThat(compatConfig.isChangeEnabled(1234L,
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 1))).isFalse();		ApplicationInfoBuilder.create().withTargetSdk(1).build())).isFalse();
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 3))).isTrue();		assertThat(compatConfig.isChangeEnabled(1234L,
	assertThat(pc.isChangeEnabled(1235L, makeAppInfo("com.some.package", 5))).isFalse();		ApplicationInfoBuilder.create().withTargetSdk(3).build())).isTrue();
	assertThat(pc.isChangeEnabled(1236L, makeAppInfo("com.some.package", 1))).isTrue();		assertThat(compatConfig.isChangeEnabled(1235L,
			ApplicationInfoBuilder.create().withTargetSdk(5).build())).isFalse();
			assertThat(compatConfig.isChangeEnabled(1236L,
			ApplicationInfoBuilder.create().withTargetSdk(1).build())).isTrue();
	}		}

	@Test		@Test
	@@ -216,15 +305,16 @@ public class CompatConfigTest {
	File dir = createTempDir();		File dir = createTempDir();
	writeToFile(dir, "libcore_platform_compat_config.xml", configXml1);		writeToFile(dir, "libcore_platform_compat_config.xml", configXml1);
	writeToFile(dir, "frameworks_platform_compat_config.xml", configXml2);		writeToFile(dir, "frameworks_platform_compat_config.xml", configXml2);
			CompatConfig compatConfig = new CompatConfig(mBuildClassifier, mContext);
	CompatConfig pc = new CompatConfig(mBuildClassifier, mContext);		compatConfig.initConfigFromLib(dir);
	pc.initConfigFromLib(dir);
			assertThat(compatConfig.isChangeEnabled(1234L,
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 1))).isFalse();		ApplicationInfoBuilder.create().withTargetSdk(1).build())).isFalse();
	assertThat(pc.isChangeEnabled(1234L, makeAppInfo("com.some.package", 3))).isTrue();		assertThat(compatConfig.isChangeEnabled(1234L,
	assertThat(pc.isChangeEnabled(1235L, makeAppInfo("com.some.package", 5))).isFalse();		ApplicationInfoBuilder.create().withTargetSdk(3).build())).isTrue();
	assertThat(pc.isChangeEnabled(1236L, makeAppInfo("com.some.package", 1))).isTrue();		assertThat(compatConfig.isChangeEnabled(1235L,
			ApplicationInfoBuilder.create().withTargetSdk(5).build())).isFalse();
			assertThat(compatConfig.isChangeEnabled(1236L,
			ApplicationInfoBuilder.create().withTargetSdk(1).build())).isTrue();
	}		}
	}		}

services/tests/servicestests/src/com/android/server/compat/OverridesBuilder.java→services/tests/servicestests/src/com/android/server/compat/CompatibilityChangeConfigBuilder.java

+8 −27

Original line number	Original line	Diff line number	Diff line
	@@ -17,55 +17,36 @@
	package com.android.server.compat;		package com.android.server.compat;

	import android.compat.Compatibility;		import android.compat.Compatibility;
	import android.os.RemoteException;

	import com.android.internal.compat.CompatibilityChangeConfig;		import com.android.internal.compat.CompatibilityChangeConfig;

	import java.util.HashSet;		import java.util.HashSet;
	import java.util.Set;		import java.util.Set;

	class OverridesBuilder {		class CompatibilityChangeConfigBuilder {
	private Set<Long> mEnabled;		private Set<Long> mEnabled;
	private Set<Long> mDisabled;		private Set<Long> mDisabled;
	private String mPackageName;

	private OverridesBuilder() {		private CompatibilityChangeConfigBuilder() {
	mEnabled = new HashSet<>();		mEnabled = new HashSet<>();
	mDisabled = new HashSet<>();		mDisabled = new HashSet<>();
	}		}

	static OverridesBuilder create() {		static CompatibilityChangeConfigBuilder create() {
	return new OverridesBuilder();		return new CompatibilityChangeConfigBuilder();
	}		}

	OverridesBuilder enable(Long id) {		CompatibilityChangeConfigBuilder enable(Long id) {
	mEnabled.add(id);		mEnabled.add(id);
	return this;		return this;
	}		}

	OverridesBuilder disable(Long id) {		CompatibilityChangeConfigBuilder disable(Long id) {
	mDisabled.add(id);		mDisabled.add(id);
	return this;		return this;
	}		}

	OverridesBuilder toPackage(String packageName) {		CompatibilityChangeConfig build() {
	mPackageName = packageName;		return new CompatibilityChangeConfig(new Compatibility.ChangeConfig(mEnabled, mDisabled));
	return this;
	}

	void override(CompatConfig config) throws RemoteException {
	config.addOverrides(
	new CompatibilityChangeConfig(
	new Compatibility.ChangeConfig(mEnabled, mDisabled)), mPackageName);
	}

	void override(PlatformCompat platformCompat) throws RemoteException {
	platformCompat.setOverrides(
	new CompatibilityChangeConfig(
	new Compatibility.ChangeConfig(mEnabled, mDisabled)), mPackageName);
	}

	void clear(PlatformCompat platformCompat) throws RemoteException {
	platformCompat.clearOverrides(mPackageName);
	}		}
	}		}

services/tests/servicestests/src/com/android/server/compat/PlatformCompatTest.java

+58 −96

File changed.

Preview size limit exceeded, changes collapsed.