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

Commit 229d3a0c authored by John Wang's avatar John Wang Committed by Android Git Automerger
Browse files

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

* commit 'fc94d45f':
  Make getDeviceId return null for Non-phone device.
parents 816e5b72 fc94d45f

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) {