commit efdb796078410bfc1dd51214485109d5f6568022
author Shuo Qian <shuoq@google.com> Thu Dec 19 15:54:27 2019 -0800
committer Shuo Qian <shuoq@google.com> Fri Dec 20 00:14:24 2019 +0000
tree 11c001651d7597f9e7d557bc4cdfab32fbbbc5e8
parent 4e6daa63f1983bec018826324b98cc4b2c6a5579

Add permission check for getDefaultCarrierServicePackageName

For Mainline, we need to make getDefaultCarrierServicePackageName system
API. Therefore, apply system permission check.

Test: built
Bug: 146583148
Change-Id: Ie1835fbebe21e3b6a81cdb4ea1d1349f82cb5316

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index d451ccf..49f690a 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -1091,6 +1091,9 @@
 
     @Override
     public String getDefaultCarrierServicePackageName() {
+        mContext.enforceCallingOrSelfPermission(
+                android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
+                "getDefaultCarrierServicePackageName");
         return mPlatformCarrierConfigPackage;
     }