Fixed a crash in TelephonyManager while calling getDeviceID()

Bug: 19056848 Change-Id: Ie241b25be212910a177c3ee5b620d646cfdd482f
2015-01-20 14:40:14 -08:00
parent 2bc2a99406
commit 201cc00947
1 changed files with 2 additions and 0 deletions
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -624,6 +624,8 @@ public class TelephonyManager {
            return getITelephony().getDeviceId();
        } catch (RemoteException ex) {
            return null;
+        } catch (NullPointerException ex) {
+            return null;
        }
    }