Merge "Revert "Always apply compat changes to system apps."" am: 612c2c731d am: a105206a92 am: 9b42b7095d am: 6f5669ed78

am: 997b46ab36

Change-Id: I80f2950ddab8f8ec9aed0699c3e89ac862c1de72

2 files changed, 0 insertions, 34 deletions

diff --git a/services/core/java/com/android/server/compat/CompatChange.java b/services/core/java/com/android/server/compat/CompatChange.java
index 6f32beea66d3..bc5973d1b270 100644
--- a/services/core/java/com/android/server/compat/CompatChange.java
+++ b/services/core/java/com/android/server/compat/CompatChange.java
@@ -118,12 +118,6 @@ public final class CompatChange {
      * @return {@code true} if the change should be enabled for the package.
      */
     boolean isEnabled(ApplicationInfo app) {
-        if (app.isSystemApp()) {
-            // All changes are enabled for system apps, and we do not support overrides.
-            // Compatibility issues for system apps should be addressed in the app itself when
-            // the compatibility change is made.
-            return true;
-        }
         if (mPackageOverrides != null && mPackageOverrides.containsKey(app.packageName)) {
             return mPackageOverrides.get(app.packageName);
         }
diff --git a/services/tests/servicestests/src/com/android/server/compat/CompatConfigTest.java b/services/tests/servicestests/src/com/android/server/compat/CompatConfigTest.java
index f3c5e99f5f90..f8c87fcb4ef6 100644
--- a/services/tests/servicestests/src/com/android/server/compat/CompatConfigTest.java
+++ b/services/tests/servicestests/src/com/android/server/compat/CompatConfigTest.java
@@ -173,34 +173,6 @@ public class CompatConfigTest {
     }
 
     @Test
-    public void testSystemAppDisabledChangeEnabled() {
-        CompatConfig pc = new CompatConfig();
-        pc.addChange(new CompatChange(1234L, "MY_CHANGE", -1, true)); // disabled
-        ApplicationInfo sysApp = makeAppInfo("system.app", 1);
-        sysApp.flags |= ApplicationInfo.FLAG_SYSTEM;
-        assertThat(pc.isChangeEnabled(1234L, sysApp)).isTrue();
-    }
-
-    @Test
-    public void testSystemAppOverrideIgnored() {
-        CompatConfig pc = new CompatConfig();
-        pc.addChange(new CompatChange(1234L, "MY_CHANGE", -1, false));
-        pc.addOverride(1234L, "system.app", false);
-        ApplicationInfo sysApp = makeAppInfo("system.app", 1);
-        sysApp.flags |= ApplicationInfo.FLAG_SYSTEM;
-        assertThat(pc.isChangeEnabled(1234L, sysApp)).isTrue();
-    }
-
-    @Test
-    public void testSystemAppTargetSdkIgnored() {
-        CompatConfig pc = new CompatConfig();
-        pc.addChange(new CompatChange(1234L, "MY_CHANGE", 2, false));
-        ApplicationInfo sysApp = makeAppInfo("system.app", 1);
-        sysApp.flags |= ApplicationInfo.FLAG_SYSTEM;
-        assertThat(pc.isChangeEnabled(1234L, sysApp)).isTrue();
-    }
-
-    @Test
     public void testReadConfig() {
         Change[] changes = {new Change(1234L, "MY_CHANGE1", false, 2), new Change(1235L,
                 "MY_CHANGE2", true, null), new Change(1236L, "MY_CHANGE3", false, null)};