diff options
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 4109a1fbdddd..5640eafcee1f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -41397,6 +41397,8 @@ package android.telephony { method public java.lang.String getDeviceSoftwareVersion(); method public java.lang.String getGroupIdLevel1(); method public java.lang.String getIccAuthentication(int, int, java.lang.String); + method public java.lang.String getImei(); + method public java.lang.String getImei(int); method public java.lang.String getLine1Number(); method public java.lang.String getMmsUAProfUrl(); method public java.lang.String getMmsUserAgent(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 861a1ebcc917..eb838fa7e8c1 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -936,8 +936,10 @@ public class TelephonyManager { * * <p>Requires Permission: * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} + * + * @hide */ - /** {@hide} */ + @SystemApi public String getImei() { return getImei(getDefaultSim()); } @@ -949,8 +951,10 @@ public class TelephonyManager { * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} * * @param slotId of which deviceID is returned + * + * @hide */ - /** {@hide} */ + @SystemApi public String getImei(int slotId) { ITelephony telephony = getITelephony(); if (telephony == null) return null; |