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

Merge "Adding module permission for SubscriptionManager" am: 116c365563 am: ce81ce3148 am: fe24624d72

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

Change-Id: I4fa538e607f1678427f7c1778197efe33545808b
This commit is contained in:
Treehugger Robot
2021-08-27 18:26:59 +00:00
committed by Automerger Merge Worker
parent 67f60bb429 fe24624d72
commit 813783a1e0
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/api/module-lib-current.txt
View File

@@ -319,6 +319,11 @@ package android.telephony {
method public static int getNumSignalStrengthLevels();
}
public class SubscriptionManager {
method public void addSubscriptionInfoRecord(@NonNull String, @Nullable String, int, int);
method public void removeSubscriptionInfoRecord(@NonNull String, int);
}
public class TelephonyManager {
method @NonNull public static int[] getAllNetworkTypes();
}

8
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -1847,8 +1847,9 @@ public class SubscriptionManager {
* @param subscriptionType the {@link #SUBSCRIPTION_TYPE}
* @hide
*/
public void addSubscriptionInfoRecord(String uniqueId, String displayName, int slotIndex,
int subscriptionType) {
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public void addSubscriptionInfoRecord(@NonNull String uniqueId, @Nullable String displayName,
int slotIndex, int subscriptionType) {
if (VDBG) {
logd("[addSubscriptionInfoRecord]+ uniqueId:" + uniqueId
+ ", displayName:" + displayName + ", slotIndex:" + slotIndex
@@ -1883,7 +1884,8 @@ public class SubscriptionManager {
* @param subscriptionType the {@link #SUBSCRIPTION_TYPE}
* @hide
*/
public void removeSubscriptionInfoRecord(String uniqueId, int subscriptionType) {
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public void removeSubscriptionInfoRecord(@NonNull String uniqueId, int subscriptionType) {
if (VDBG) {
logd("[removeSubscriptionInfoRecord]+ uniqueId:" + uniqueId
+ ", subscriptionType: " + subscriptionType);