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

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

Browse Source 
* commit 'c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
  Revert "Do not merge. Return null id for Non-phone device."
This commit is contained in:
John Wang
2011-06-16 17:14:28 -07:00
committed by Android Git Automerger
parent 769bf5d59e c6b32054c6
commit e21217af64
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

@@ -191,10 +191,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) {