Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: e2b306e30e

Change-Id: Ida4807876ce741a211189e41e92383404b6a3a3c
This commit is contained in:
Polina Bondarenko
2017-01-16 18:02:32 +00:00
committed by android-build-merger
parent 714c8596ad e2b306e30e
commit d4c48e911e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -40767,6 +40767,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();

8
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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;