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

Commit fe9aa270 authored by John Wang's avatar John Wang Committed by Android (Google) Code Review
Browse files

Revert "Do not merge. Return null id for Non-phone device." 

This reverts commit cea03df2
parent cea03df2

telephony/java/android/telephony/TelephonyManager.java

+0 −4
Original line number Diff line number Diff line
@@ -192,10 +192,6 @@ public class TelephonyManager { 
     *   {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}

     */

    public String getDeviceId() {

        if (!isVoiceCapable()) {

            return null;

        }



        try {

            return getSubscriberInfo().getDeviceId();

        } catch (RemoteException ex) {