summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ryan Mitchell <rtmitchell@google.com> 2019-10-30 08:52:43 -0700
committer Ryan Mitchell <rtmitchell@google.com> 2019-10-30 08:52:43 -0700
commit61a3032198b496ccf99baf88e8b1512a1141c07d (patch)
tree321f12f7d5662cd8a057a68ca80e40906a00ddb9
parentd35f57130f2cdf5fbff5aad55697ccc7ac17243d (diff)
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
-rw-r--r--core/java/com/android/server/SystemConfig.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java
index ea0389f49a45..e3fe029be9c6 100644
--- a/core/java/com/android/server/SystemConfig.java
+++ b/core/java/com/android/server/SystemConfig.java
@@ -855,11 +855,7 @@ public class SystemConfig {
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": {