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

Merge changes from topic "118349116"

Browse Source 
am: 90f496b14c

Change-Id: I34e02179d9718acf9bf00bd500f535e36c3c7804
This commit is contained in:
Xiangyu/Malcolm Chen
2018-12-20 16:37:24 -08:00
committed by android-build-merger
parent 7e1f24c626 90f496b14c
commit 14823f0ced
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2393,7 +2393,7 @@ public class SubscriptionManager {
* *
* Caller will either have {@link android.Manifest.permission#MODIFY_PHONE_STATE} * Caller will either have {@link android.Manifest.permission#MODIFY_PHONE_STATE}
* permission or had carrier privilege permission on the subscriptions: * permission or had carrier privilege permission on the subscriptions:
* {@link TelephonyManager#hasCarrierPrivileges(int)} or * {@link TelephonyManager#hasCarrierPrivileges()} or
* {@link #canManageSubscription(SubscriptionInfo)} * {@link #canManageSubscription(SubscriptionInfo)}
* *
* @throws SecurityException if the caller doesn't meet the requirements * @throws SecurityException if the caller doesn't meet the requirements
@@ -2431,7 +2431,7 @@ public class SubscriptionManager {
* *
* Caller will either have {@link android.Manifest.permission#MODIFY_PHONE_STATE} * Caller will either have {@link android.Manifest.permission#MODIFY_PHONE_STATE}
* permission or had carrier privilege permission on the subscriptions: * permission or had carrier privilege permission on the subscriptions:
* {@link TelephonyManager#hasCarrierPrivileges(int)} or * {@link TelephonyManager#hasCarrierPrivileges()} or
* {@link #canManageSubscription(SubscriptionInfo)} * {@link #canManageSubscription(SubscriptionInfo)}
* *
* @throws SecurityException if the caller doesn't meet the requirements * @throws SecurityException if the caller doesn't meet the requirements
@@ -2467,7 +2467,7 @@ public class SubscriptionManager {
* *
* Caller will either have {@link android.Manifest.permission#READ_PHONE_STATE} * Caller will either have {@link android.Manifest.permission#READ_PHONE_STATE}
* permission or had carrier privilege permission on the subscription. * permission or had carrier privilege permission on the subscription.
* {@link TelephonyManager#hasCarrierPrivileges(int)} * {@link TelephonyManager#hasCarrierPrivileges()}
* *
* @throws SecurityException if the caller doesn't meet the requirements * @throws SecurityException if the caller doesn't meet the requirements
* outlined above. * outlined above.