diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-01-16 17:49:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-16 17:49:59 +0000 |
| commit | dc61ad0ad8455d87883768eb9146cf2dbf9ba128 (patch) | |
| tree | e7ac2d0555f60d6f5de672200f1e6f0b02bf8040 | |
| parent | c5e5442acd41d5632fd2cdf7fa9f1c87be4a2115 (diff) | |
| parent | 933a594c9f04401343e63554a82886dcf8495a79 (diff) | |
| download | base-dc61ad0ad8455d87883768eb9146cf2dbf9ba128.tar.gz | |
Merge "Make TelephonyManager.getImei a system APIs."
| -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 a2bd6c5d817a..920780ff2f39 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -40771,6 +40771,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 45d0576efab5..6a0aa84426d4 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -904,8 +904,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()); } @@ -917,8 +919,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; |