Merge "Make getDefaultCarrierServicePackageName for Mainline" am: 071d78b1ef am: 58fd0fd58d (a98d79fb) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -7915,6 +7915,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);

+19 −4

Original line number	Diff line number	Diff line
		@@ -4043,13 +4043,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 "";
		}

		/**