Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec428aa4 authored by Shuo Qian's avatar Shuo Qian
Browse files

Make getDefaultCarrierServicePackageName for Mainline 

Make this API system to resolve mainline concern. It is ok to make it
system API as it is not a key in CarrierConfigManager. We can add
permission check on the other side.

Test: built
Bug: 146583148
Change-Id: I7c4297d659635622ba4523abf2ce32e21f961ad0
parent 472f9b15

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7912,6 +7912,7 @@ package android.telephony { 
  }















  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



+19
−4




























Original line number
Diff line number
Diff line








@@ -4023,13 +4023,28 @@ public class CarrierConfigManager {













        }















    }





























    /** {@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 "";















    }































    /**