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

am f0f5eee8: Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e760 automerge: 76e9d18

Browse Source 
* commit 'f0f5eee8238284aad08fd573959392542e57a8ab':
  Fixed a crash in TelephonyManager while calling getDeviceID()
This commit is contained in:
Sanket Padawe
2015-01-20 23:54:52 +00:00
committed by Android Git Automerger
parent 0ae35a8a26 f0f5eee823
commit 63e77bf8a5
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();
} catch (RemoteException ex) {
return null;
} catch (NullPointerException ex) {
return null;
}
}