commit 61a3032198b496ccf99baf88e8b1512a1141c07d
author Ryan Mitchell <rtmitchell@google.com> Wed Oct 30 08:52:43 2019 -0700
committer Ryan Mitchell <rtmitchell@google.com> Wed Oct 30 08:52:43 2019 -0700
tree 321f12f7d5662cd8a057a68ca80e40906a00ddb9
parent d35f57130f2cdf5fbff5aad55697ccc7ac17243d

Do not enforce partition restrictions on component-override

Previously, any static RRO could change the manifest value of any
resource in any package. The initial component-override change
restricted this to only partitions with the ALLOW_APP_CONFIGS flag
are allowed to configure component enabled state.

This change allows any partition to use component-override.

Bug: 135048762
Test: adb shell pm query-services \
      com.android.bluetooth/.sap.SapService

Change-Id: I035b2233bceb4ed7b091295e5aaa99b61dad851e

core/java/com/android/server/SystemConfig.java

diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java
index ea0389f..e3fe029 100644
--- a/core/java/com/android/server/SystemConfig.java
+++ b/core/java/com/android/server/SystemConfig.java
@@ -855,11 +855,7 @@
                         XmlUtils.skipCurrentTag(parser);
                     } break;
                     case "component-override": {
-                        if (allowAppConfigs) {
-                            readComponentOverrides(parser, permFile);
-                        } else {
-                            logNotAllowedInPartition(name, permFile, parser);
-                        }
+                        readComponentOverrides(parser, permFile);
                         XmlUtils.skipCurrentTag(parser);
                     } break;
                     case "backup-transport-whitelisted-service": {