summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorzoey chen <zoeychen@google.com>2019-12-03 21:02:27 +0800
committerDaniel Bright <dbright@google.com>2020-08-27 15:57:57 -0700
commitc647fa10a9c19b4ffd111d59a0778ab39e757cf4 (patch)
tree9c190770898e0ab0803ba0edd9bd2871cea0c24f /api
parentd09cf2748644f2c7c74aaebffea5daff129a4177 (diff)
[TelephonyMainline] Make getMergedSubscriberIdsFromGroup as System API and rename it
Bug: 145584030 Test: make Merged-In: I6c077f3bee6bfd4d5b215aca4e9b19b719772b29 Change-Id: I6c077f3bee6bfd4d5b215aca4e9b19b719772b29
Diffstat (limited to 'api')
-rwxr-xr-xapi/system-current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 0017136cd65f..05d87c219738 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -9026,6 +9026,7 @@ package android.telephony {
method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping();
method public int getMaxNumberOfSimultaneouslyActiveSims();
method public static long getMaxNumberVerificationTimeoutMillis();
+ method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String[] getMergedImsisFromGroup();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getPreferredNetworkTypeBitmask();
method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public int getRadioPowerState();
method public int getSimApplicationState();