Commit f0f5eee8 authored Jan 20, 2015 by Sanket Padawe Committed by android-build-merger Jan 20, 2015

Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into...

Merge "Fixed a crash in TelephonyManager while calling getDeviceID()" into lmp-mr1-dev automerge: e54e7604
automerge: 76e9d180

* commit '76e9d180':
  Fixed a crash in TelephonyManager while calling getDeviceID()

parents 00959a56 76e9d180

telephony/java/android/telephony/TelephonyManager.java

+2 −0

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