Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev

2015-01-20 22:50:02 +00:00
parent 054f2656a1 201cc00947
commit e54e760477
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;
        }
    }