commit 63e77bf8a5be6844bd8fd9d07cd303f6dc72c64e
author Sanket Padawe <sanketpadawe@google.com> Tue Jan 20 23:54:52 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 20 23:54:52 2015 +0000
tree 0029a469e4730e08bdcb82eb932dca1d946bbd47
parent 0ae35a8a26be0c2be53e5d149aead4d5d32ad07f
parent f0f5eee8238284aad08fd573959392542e57a8ab

am f0f5eee8: Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760 automerge: 76e9d18

* commit 'f0f5eee8238284aad08fd573959392542e57a8ab':
  Fixed a crash in TelephonyManager while calling getDeviceID()

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 41f0bdd..ace945d 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -624,6 +624,8 @@
             return getITelephony().getDeviceId();
         } catch (RemoteException ex) {
             return null;
+        } catch (NullPointerException ex) {
+            return null;
         }
     }