Commit 63e77bf8 authored Jan 20, 2015 by Sanket Padawe Committed by Android Git Automerger Jan 20, 2015

am f0f5eee8: Merge "Fixed a crash in TelephonyManager while calling...

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

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

parents 0ae35a8a f0f5eee8

telephony/java/android/telephony/TelephonyManager.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}
	}		}