Deprecated getDeviceId and added getMeid and getImei
Added two new public APIs getMeid and getImei. Deprecated the exisintg getDeviceId API because it can't return a constant id when phone type changes. Test: CTS and manual bug: 34233620, 10831289 Merged-In: Iad4c05d2fd2efc538214f466861497c973882dfe Change-Id: Iad4c05d2fd2efc538214f466861497c973882dfe
This commit is contained in:
@@ -38200,13 +38200,17 @@ package android.telephony {
|
||||
method public boolean getDataEnabled();
|
||||
method public int getDataNetworkType();
|
||||
method public int getDataState();
|
||||
method public java.lang.String getDeviceId();
|
||||
method public java.lang.String getDeviceId(int);
|
||||
method public deprecated java.lang.String getDeviceId();
|
||||
method public deprecated java.lang.String getDeviceId(int);
|
||||
method public java.lang.String getDeviceSoftwareVersion();
|
||||
method public java.lang.String[] getForbiddenPlmns();
|
||||
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 getMeid();
|
||||
method public java.lang.String getMeid(int);
|
||||
method public java.lang.String getMmsUAProfUrl();
|
||||
method public java.lang.String getMmsUserAgent();
|
||||
method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();
|
||||
|
||||
@@ -41418,8 +41418,8 @@ package android.telephony {
|
||||
method public boolean getDataEnabled(int);
|
||||
method public int getDataNetworkType();
|
||||
method public int getDataState();
|
||||
method public java.lang.String getDeviceId();
|
||||
method public java.lang.String getDeviceId(int);
|
||||
method public deprecated java.lang.String getDeviceId();
|
||||
method public deprecated java.lang.String getDeviceId(int);
|
||||
method public java.lang.String getDeviceSoftwareVersion();
|
||||
method public java.lang.String[] getForbiddenPlmns();
|
||||
method public java.lang.String getGroupIdLevel1();
|
||||
@@ -41427,6 +41427,8 @@ package android.telephony {
|
||||
method public java.lang.String getImei();
|
||||
method public java.lang.String getImei(int);
|
||||
method public java.lang.String getLine1Number();
|
||||
method public java.lang.String getMeid();
|
||||
method public java.lang.String getMeid(int);
|
||||
method public java.lang.String getMmsUAProfUrl();
|
||||
method public java.lang.String getMmsUserAgent();
|
||||
method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();
|
||||
|
||||
@@ -38282,13 +38282,17 @@ package android.telephony {
|
||||
method public boolean getDataEnabled();
|
||||
method public int getDataNetworkType();
|
||||
method public int getDataState();
|
||||
method public java.lang.String getDeviceId();
|
||||
method public java.lang.String getDeviceId(int);
|
||||
method public deprecated java.lang.String getDeviceId();
|
||||
method public deprecated java.lang.String getDeviceId(int);
|
||||
method public java.lang.String getDeviceSoftwareVersion();
|
||||
method public java.lang.String[] getForbiddenPlmns();
|
||||
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 getMeid();
|
||||
method public java.lang.String getMeid(int);
|
||||
method public java.lang.String getMmsUAProfUrl();
|
||||
method public java.lang.String getMmsUserAgent();
|
||||
method public deprecated java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();
|
||||
|
||||
Reference in New Issue
Block a user