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

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

Browse Source
This commit is contained in:
John Wang
2011-06-16 16:47:18 -07:00
committed by Android (Google) Code Review
parent 2f04883ff8 fe9aa2706f
commit c826f92e6f
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -192,10 +192,6 @@ public class TelephonyManager {
* {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE}
*/ */
public String getDeviceId() { public String getDeviceId() {
if (!isVoiceCapable()) {
return null;
}
try { try {
return getSubscriberInfo().getDeviceId(); return getSubscriberInfo().getDeviceId();
} catch (RemoteException ex) { } catch (RemoteException ex) {