From 201cc00947bceb71166d0800fb770eedb4ccb3f1 Mon Sep 17 00:00:00 2001 From: Sanket Padawe Date: Tue, 20 Jan 2015 14:40:14 -0800 Subject: Fixed a crash in TelephonyManager while calling getDeviceID() Bug: 19056848 Change-Id: Ie241b25be212910a177c3ee5b620d646cfdd482f --- telephony/java/android/telephony/TelephonyManager.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'telephony') diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index caa4fd0..fe717dd 100644 --- 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; } } -- cgit v1.1