diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 8517b769d2a5d..1317ecc167d5a 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1605,7 +1605,7 @@ public class TelephonyManager { * higher, then a SecurityException is thrown. * * - * @deprecated Use (@link getImei} which returns IMEI for GSM or (@link getMeid} which returns + * @deprecated Use {@link #getImei} which returns IMEI for GSM or {@link #getMeid} which returns * MEID for CDMA. */ @Deprecated @@ -1648,7 +1648,7 @@ public class TelephonyManager { * * @param slotIndex of which deviceID is returned * - * @deprecated Use (@link getImei} which returns IMEI for GSM or (@link getMeid} which returns + * @deprecated Use {@link #getImei} which returns IMEI for GSM or {@link #getMeid} which returns * MEID for CDMA. */ @Deprecated @@ -1672,23 +1672,8 @@ public class TelephonyManager { * Returns the IMEI (International Mobile Equipment Identity). Return null if IMEI is not * available. * - *
Requires Permission: READ_PRIVILEGED_PHONE_STATE, for the calling app to be the device or - * profile owner and have the READ_PHONE_STATE permission, or that the calling app has carrier - * privileges (see {@link #hasCarrierPrivileges}). The profile owner is an app that owns a - * managed profile on the device; for more details see Work profiles. Profile owner - * access is deprecated and will be removed in a future release. - * - *
If the calling app does not meet one of these requirements then this method will behave - * as follows: - * - *
Requires Permission: READ_PRIVILEGED_PHONE_STATE, for the calling app to be the device or - * profile owner and have the READ_PHONE_STATE permission, or that the calling app has carrier - * privileges (see {@link #hasCarrierPrivileges}). The profile owner is an app that owns a - * managed profile on the device; for more details see Work profiles. Profile owner - * access is deprecated and will be removed in a future release. + *
This API requires one of the following: + *
The profile owner is an app that owns a managed profile on the device; for more details + * see Work profiles. + * Access by profile owners is deprecated and will be removed in a future release. * *
If the calling app does not meet one of these requirements then this method will behave * as follows: