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

Merge "Expose carrier privilege rules certificates as @TestApi." am: c2c84d169a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683909

Change-Id: I9ddeafeacae76ecc4aa80eecd6503b2fea8378b9
This commit is contained in:
Treehugger Robot
2021-04-28 22:28:31 +00:00
committed by Automerger Merge Worker
parent da34aa41a8 c2c84d169a
commit 1819888bfb
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/test-current.txt
View File

@@ -1683,6 +1683,7 @@ package android.telephony {
public class TelephonyManager {
method public int addDevicePolicyOverrideApn(@NonNull android.content.Context, @NonNull android.telephony.data.ApnSetting);
method public int getCarrierIdListVersion();
method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<java.lang.String> getCertsFromCarrierPrivilegeAccessRules();
method @NonNull public java.util.List<android.telephony.data.ApnSetting> getDevicePolicyOverrideApns(@NonNull android.content.Context);
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();
method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();

16
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -11205,26 +11205,26 @@ public class TelephonyManager {
}
/**
* Return a list of certs in hex string from loaded carrier privileges access rules.
* Return a list of certs as hex strings from loaded carrier privileges access rules.
*
* @return a list of certificate in hex string. return {@code null} if there is no certs
* or privilege rules are not loaded yet.
*
* <p>Requires Permission:
* {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE}
* @return a list of certificates as hex strings, or an empty list if there are no certs or
* privilege rules are not loaded yet.
* @hide
*/
@TestApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@NonNull
public List<String> getCertsFromCarrierPrivilegeAccessRules() {
List<String> certs = null;
try {
ITelephony service = getITelephony();
if (service != null) {
return service.getCertsFromCarrierPrivilegeAccessRules(getSubId());
certs = service.getCertsFromCarrierPrivilegeAccessRules(getSubId());
}
} catch (RemoteException ex) {
// This could happen if binder process crashes.
}
return null;
return certs == null ? Collections.emptyList() : certs;
}
/**