Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2 (c826f92e) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -192,10 +192,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) {