commit 45b51c79fb53b44577f84e5ad8003c4288699f7b
author Malcolm Chen <refuhoo@google.com> Thu Mar 01 13:58:03 2018 -0800
committer Malcolm Chen <refuhoo@google.com> Fri Jun 08 16:19:00 2018 -0700
tree 5e55e5f16293d0fa24adf8690336b5dd69be6353
parent 2e60200fcc459cf727799f3eb91cb9458466c748

Have proper permission check in getConfigForSubId

getConfigForSubId also needs to check permission from AppOps, but
it's not. This change fixes it. Within this commit, PhoneGlobals#
getCarrierConfigForSubId always passes its own packageName as
when calling getConfigForSubId, so further change is needed (pass
external callingPackage or clear calling identity).

Bug: 73136824
Test: regression
Change-Id: Icfefd2cc17633304a397d573a9e010385c5799c8

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index d4da7fe..b1e061f 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -437,7 +437,7 @@
     }
 
     public PersistableBundle getCarrierConfigForSubId(int subId) {
-        return configLoader.getConfigForSubId(subId);
+        return configLoader.getConfigForSubId(subId, getOpPackageName());
     }
 
     private void registerSettingsObserver() {