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

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

Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE

parents ee3de4a9 e19736f0

telephony/java/android/telephony/TelephonyManager.java

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