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

Commit f9ab96f9 authored by John Wang's avatar John Wang
Browse files

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

This reverts commit cea03df2

Change-Id: I68470e729d9304f1c27473a71334e1b0de99ff01
parent e2474bc7

telephony/java/android/telephony/TelephonyManager.java

+0 −4
Original line number Diff line number Diff line
@@ -191,10 +191,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) {