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

Merge "Make getDefaultCarrierServicePackageName for Mainline" am: 071d78b1ef am: 58fd0fd58d

Browse Source 
Change-Id: I9150a6d9c2252ae3d7931c0a2bf13b1262bcac4b
This commit is contained in:
Automerger Merge Worker
2019-12-20 18:46:25 +00:00
parent 88fce755c3 58fd0fd58d
commit a98d79fb32
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 {
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);

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

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