commit 55745eca73eea3362bc8d1d737cee1ffb382326f
author Polina Bondarenko <pbond@google.com> Mon Jan 16 18:10:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 16 18:10:40 2017 +0000
tree c57475b560cfe1812af505f0a83317a226cf6e9b
parent 098bbc455d9f0fa4c32fb70018e4d3e235c0a927
parent d4c48e911ecd99b8bbb0e8790b0339ae69bb9cbc

Merge "Make TelephonyManager.getImei a system APIs." am: dc61ad0ad8 am: e2b306e30e
am: d4c48e911e

Change-Id: Iac1e5f257d6a8263c78af8d9199848244fe6d93c

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 8c54ec3..f42e1f2 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -40767,6 +40767,8 @@
     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();

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 45d0576..6a0aa84 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -904,8 +904,10 @@
      *
      * <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 @@
      *   {@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;