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

Commit dc61ad0a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Make TelephonyManager.getImei a system APIs."

parents c5e5442a 933a594c

api/system-current.txt

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

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;