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

Commit d2dd69ae authored by Sanket Padawe's avatar Sanket Padawe Committed by Android (Google) Code Review
Browse files

Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev

parents c68ab86a 0b7f5e81

telephony/java/android/telephony/TelephonyManager.java

+5 −1
Original line number Diff line number Diff line
@@ -620,7 +620,11 @@ public class TelephonyManager { 
     *   {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}

     */

    public String getDeviceId() {

        return getDeviceId(getDefaultSim());

        try {

            return getITelephony().getDeviceId();

        } catch (RemoteException ex) {

            return null;

        }

    }



    /**

telephony/java/com/android/internal/telephony/ITelephony.aidl

+10 −0
Original line number Diff line number Diff line
@@ -865,8 +865,18 @@ interface ITelephony { 
     * @return {@code True} if the user has enabled video calling, {@code false} otherwise.

     */

    boolean isVideoCallingEnabled();



    /**

     * Get IMS Registration Status

     */

    boolean isImsRegistered();



    /**

      * Returns the unique device ID of phone, for example, the IMEI for

      * GSM and the MEID for CDMA phones. Return null if device ID is not available.

      *

      * <p>Requires Permission:

      *   {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}

      */

    String getDeviceId();

}