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

Don't check OverrideAllowedState

Browse Source 
Don't check OverrideAllowedState when calling remove overrides and there
are no overrides.
This fixes failure in CompatChangesTest (tried to clear non existing
overrides for a logging only change).
Also fixed return value of removeOverride to return the correct thing.

Test: atest  com.android.server.compat.CompatConfigTest
Test: atest  android.app.compat.CompatChangesTest
Bug: 151421544
Change-Id: I9c63f332337bc465115556fbc6f0b40fb7e102da
This commit is contained in:
atrost
2020-03-13 13:42:26 +00:00
parent 8fa645a2db
commit e9968908bd
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

@@ -247,11 +247,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.
@@ -298,12 +300,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

@@ -250,6 +250,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)