commit 9797cbbee8d0c9296c4a5c79fbd41098cd9c89c9
author Philip P. Moltmann <moltmann@google.com> Tue Jan 07 13:45:00 2020 -0800
committer Philip P. Moltmann <moltmann@google.com> Tue Jan 07 16:09:47 2020 -0800
tree d18aba3e4bfe3d65098bf82614cf0ff74beefe6d
parent a0c6881ad75267773683f41bbc76506e7d90d0fd

(Backport) Pipe though componentId from caller to permission checks

Test: atest TeleServiceTests
Bug: 136595429
Change-Id: I36f8a7bcaf33efd05429fb44f6349ef9f30a7461
Merged-In: I3e6a3b0bd1c443660d0dcd27b6c8af0388330dec

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 49f690a..d213fd9 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -967,8 +967,14 @@
 
     @Override
     public @NonNull PersistableBundle getConfigForSubId(int subId, String callingPackage) {
-        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
-                mContext, subId, callingPackage, "getCarrierConfig")) {
+        return getConfigForSubIdWithFeature(subId, callingPackage, null);
+    }
+
+    @Override
+    public @NonNull PersistableBundle getConfigForSubIdWithFeature(int subId, String callingPackage,
+            String callingFeatureId) {
+        if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(mContext, subId, callingPackage,
+                callingFeatureId, "getCarrierConfig")) {
             return new PersistableBundle();
         }