Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sanket Padawe
2015-01-20 22:50:02 +00:00
committed by Android (Google) Code Review
parent 054f2656a1 201cc00947
commit e54e760477
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -624,6 +624,8 @@ public class TelephonyManager {
return getITelephony().getDeviceId(); return getITelephony().getDeviceId();
} catch (RemoteException ex) { } catch (RemoteException ex) {
return null; return null;
} catch (NullPointerException ex) {
return null;
} }
} }