diff options
| author | 2018-12-20 16:37:24 -0800 | |
|---|---|---|
| committer | 2018-12-20 16:37:24 -0800 | |
| commit | 14823f0cedb8a981e408cd7a40713fcc27443c46 (patch) | |
| tree | d2a4f33fc4af6a456e0976722a26e32ae47ec861 | |
| parent | 7e1f24c6264d29e97d5759944e5805237a6bad4c (diff) | |
| parent | 90f496b14c31f519df8ef4c33f76d0c20f3564b8 (diff) | |
Merge changes from topic "118349116"
am: 90f496b14c
Change-Id: I34e02179d9718acf9bf00bd500f535e36c3c7804
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 6efa445faa45..47f265675765 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -2393,7 +2393,7 @@ public class SubscriptionManager { * * Caller will either have {@link android.Manifest.permission#MODIFY_PHONE_STATE} * permission or had carrier privilege permission on the subscriptions: - * {@link TelephonyManager#hasCarrierPrivileges(int)} or + * {@link TelephonyManager#hasCarrierPrivileges()} or * {@link #canManageSubscription(SubscriptionInfo)} * * @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} * permission or had carrier privilege permission on the subscriptions: - * {@link TelephonyManager#hasCarrierPrivileges(int)} or + * {@link TelephonyManager#hasCarrierPrivileges()} or * {@link #canManageSubscription(SubscriptionInfo)} * * @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} * 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 * outlined above. |