commit 58fd0fd58d62d366fda04384fa553d6123b32de2
author Shuo Qian <shuoq@google.com> Fri Dec 20 10:29:18 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 20 10:29:18 2019 -0800
tree c6a059320d24f52ce216c4152889f42fbe14f59c
parent 6ae159e0355de9ef1ee3ccd898f721727dd54e9d
parent 071d78b1ef0b4caaf45a5d378debd1dff22477cc

Merge "Make getDefaultCarrierServicePackageName for Mainline"
am: 071d78b1ef

Change-Id: I97c5ecfaf01856e0983f0805e357211f75dfdf06

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index ceb6bc7..001412d 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -7915,6 +7915,7 @@
   }
 
   public class CarrierConfigManager {
+    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDefaultCarrierServicePackageName();
     method @NonNull public static android.os.PersistableBundle getDefaultConfig();
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void overrideConfig(int, @Nullable android.os.PersistableBundle);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void updateConfigForPhoneId(int, String);

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 5e8cba7..6267e7d 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -3988,13 +3988,28 @@
         }
     }
 
-    /** {@hide} */
+    /**
+     * Gets the package name for a default carrier service.
+     * @return the package name for a default carrier service; empty string if not available.
+     *
+     * @hide
+     */
+    @NonNull
+    @SystemApi
+    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
     public String getDefaultCarrierServicePackageName() {
         try {
-            return getICarrierConfigLoader().getDefaultCarrierServicePackageName();
-        } catch (Throwable t) {
-            return null;
+            ICarrierConfigLoader loader = getICarrierConfigLoader();
+            if (loader == null) {
+                Rlog.w(TAG, "getDefaultCarrierServicePackageName ICarrierConfigLoader is null");
+                return "";
+            }
+            return loader.getDefaultCarrierServicePackageName();
+        } catch (RemoteException ex) {
+            Rlog.e(TAG, "getDefaultCarrierServicePackageName ICarrierConfigLoader is null"
+                    + ex.toString());
         }
+        return "";
     }
 
     /**