Commit e21217af authored Jun 16, 2011 by John Wang Committed by Android Git Automerger Jun 16, 2011

am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for...

am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2

* commit 'c6b32054':
  Revert "Do not merge. Return null id for Non-phone device."

parents 769bf5d5 c6b32054

telephony/java/android/telephony/TelephonyManager.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -191,10 +191,6 @@ public class TelephonyManager {
		* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
		*/
		public String getDeviceId() {
		if (!isVoiceCapable()) {
		return null;
		}

		try {
		return getSubscriberInfo().getDeviceId();
		} catch (RemoteException ex) {