summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorMalcolm Chen <refuhoo@google.com>2018-02-28 15:20:45 -0800
committerMalcolm Chen <refuhoo@google.com>2018-07-30 17:08:27 -0700
commit05ab439039544df6ea1cb66829159013eda52ddc (patch)
tree5c376368f6cf0542525d09f8fe2ecdc0c050c4dc /core/java
parent2eb9f746cfb260d65a298d28fbe25c86f58ad003 (diff)
Have proper permission check in getConfigForSubId
In CarrierConfigManager, add pass context in constructor, so that when calling CarrierConfigLoader#getConfigForSubId, it can pass callingPackage. Bug: 73136824 Test: regression Change-Id: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec Merged-In: I4bbff4ea30e2d5473c14d24d6833bf3ca3c595ec
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/SystemServiceRegistry.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index 3f35d277b56e..fdda85d5122a 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -518,7 +518,7 @@ final class SystemServiceRegistry {
new CachedServiceFetcher<CarrierConfigManager>() {
@Override
public CarrierConfigManager createService(ContextImpl ctx) {
- return new CarrierConfigManager();
+ return new CarrierConfigManager(ctx.getOuterContext());
}});
registerService(Context.TELECOM_SERVICE, TelecomManager.class,