Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55745eca authored by Polina Bondarenko's avatar Polina Bondarenko Committed by android-build-merger
Browse files

Merge "Make TelephonyManager.getImei a system APIs." am: dc61ad0a am: e2b306e3 

am: d4c48e91

Change-Id: Iac1e5f257d6a8263c78af8d9199848244fe6d93c
parents 098bbc45 d4c48e91

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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();

telephony/java/android/telephony/TelephonyManager.java

+6 −2
Original line number Diff line number Diff line
@@ -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;