Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make getDefaultCarrierServicePackageName for Mainline"

Browse Source
This commit is contained in:
Shuo Qian
2019-12-20 18:23:12 +00:00
committed by Gerrit Code Review
parent 0c3db7785a ec428aa436
commit 071d78b1ef
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -7915,6 +7915,7 @@ package android.telephony {
} }
public class CarrierConfigManager { 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 @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 overrideConfig(int, @Nullable android.os.PersistableBundle);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void updateConfigForPhoneId(int, String); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void updateConfigForPhoneId(int, String);

23
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -3988,13 +3988,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() { public String getDefaultCarrierServicePackageName() {
try { try {
return getICarrierConfigLoader().getDefaultCarrierServicePackageName(); ICarrierConfigLoader loader = getICarrierConfigLoader();
} catch (Throwable t) { if (loader == null) {
return 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 "";
} }
/** /**