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

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

am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 

* commit 'c826f92e':
  Revert "Do not merge. Return null id for Non-phone device."
parents 9a73c4d3 c826f92e

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