diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-01-20 14:40:14 -0800 |
|---|---|---|
| committer | Sanket Padawe <sanketpadawe@google.com> | 2015-01-20 14:40:14 -0800 |
| commit | 201cc00947bceb71166d0800fb770eedb4ccb3f1 (patch) | |
| tree | 9835b9a786120e4a139abba11579c3c601bff4bd /telephony/java/android | |
| parent | 2bc2a99406d1d0a4a6c0a6a5ec39f5f9273a1634 (diff) | |
| download | frameworks_base-201cc00947bceb71166d0800fb770eedb4ccb3f1.zip frameworks_base-201cc00947bceb71166d0800fb770eedb4ccb3f1.tar.gz frameworks_base-201cc00947bceb71166d0800fb770eedb4ccb3f1.tar.bz2 | |
Fixed a crash in TelephonyManager while calling getDeviceID()
Bug: 19056848
Change-Id: Ie241b25be212910a177c3ee5b620d646cfdd482f
Diffstat (limited to 'telephony/java/android')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
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; } } |