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

Merge "Adding module permission for SubscriptionManager"

Browse Source
This commit is contained in:
Treehugger Robot
2021-08-27 17:29:58 +00:00
committed by Gerrit Code Review
parent 5834070338 6a646db625
commit 116c365563
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

@@ -160,6 +160,11 @@ package android.telephony {
method public static int getNumSignalStrengthLevels(); 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 { public class TelephonyManager {
method @NonNull public static int[] getAllNetworkTypes(); method @NonNull public static int[] getAllNetworkTypes();
} }

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

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