Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't check OverrideAllowedState"

Browse Source
This commit is contained in:
Anna Trostanetski
2020-03-17 12:19:46 +00:00
committed by Gerrit Code Review
parent c118981c9c 2faac55aa7
commit 86d1a3ec68
3 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/compat/CompatChange.java
View File

@@ -151,6 +151,15 @@ public final class CompatChange extends CompatibilityChangeInfo {
return true;
}
/**
* Checks whether a change has an override for a package.
* @param packageName name of the package
* @return true if there is such override
*/
boolean hasOverride(String packageName) {
return mPackageOverrides != null && mPackageOverrides.containsKey(packageName);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder("ChangeId(")

26
services/core/java/com/android/server/compat/CompatConfig.java
View File

@@ -242,11 +242,13 @@ final class CompatConfig {
CompatChange c = mChanges.get(changeId);
try {
if (c != null) {
OverrideAllowedState allowedState =
mOverrideValidator.getOverrideAllowedState(changeId, packageName);
allowedState.enforce(changeId, packageName);
overrideExists = true;
c.removePackageOverride(packageName);
overrideExists = c.hasOverride(packageName);
if (overrideExists) {
OverrideAllowedState allowedState =
mOverrideValidator.getOverrideAllowedState(changeId, packageName);
allowedState.enforce(changeId, packageName);
c.removePackageOverride(packageName);
}
}
} catch (RemoteException e) {
// Should never occur, since validator is in the same process.
@@ -291,12 +293,14 @@ final class CompatConfig {
for (int i = 0; i < mChanges.size(); ++i) {
try {
CompatChange change = mChanges.valueAt(i);
OverrideAllowedState allowedState =
mOverrideValidator.getOverrideAllowedState(change.getId(),
packageName);
allowedState.enforce(change.getId(), packageName);
if (change != null) {
mChanges.valueAt(i).removePackageOverride(packageName);
if (change.hasOverride(packageName)) {
OverrideAllowedState allowedState =
mOverrideValidator.getOverrideAllowedState(change.getId(),
packageName);
allowedState.enforce(change.getId(), packageName);
if (change != null) {
mChanges.valueAt(i).removePackageOverride(packageName);
}
}
} catch (RemoteException e) {
// Should never occur, since validator is in the same process.

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

@@ -248,6 +248,28 @@ public class CompatConfigTest {
assertThat(compatConfig.isChangeEnabled(1234L, applicationInfo)).isTrue();
}
@Test
public void testAllowRemoveOverrideNoOverride() throws Exception {
CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)
.addDisabledChangeWithId(1234L)
.addLoggingOnlyChangeWithId(2L)
.build();
ApplicationInfo applicationInfo = ApplicationInfoBuilder.create()
.withPackageName("com.some.package")
.build();
when(mPackageManager.getApplicationInfo(eq("com.some.package"), anyInt()))
.thenReturn(applicationInfo);
// 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 remove a non existing override, and it doesn't fail.
assertThat(compatConfig.removeOverride(1234L, "com.some.package")).isFalse();
assertThat(compatConfig.removeOverride(2L, "com.some.package")).isFalse();
compatConfig.removePackageOverrides("com.some.package");
}
@Test
public void testRemovePackageOverride() throws Exception {
CompatConfig compatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext)