diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-01-14 09:49:58 -0800 |
|---|---|---|
| committer | Sanket Padawe <sanketpadawe@google.com> | 2015-01-14 09:49:58 -0800 |
| commit | 0b7f5e81ba06f694df8c8cccaea9e009e3200b4c (patch) | |
| tree | 314fb026cab061b21b9d5011240778596e636e5b /telephony/java/android | |
| parent | cce8db2c31a03d0c4e04f5851415d37032ae6621 (diff) | |
| download | frameworks_base-0b7f5e81ba06f694df8c8cccaea9e009e3200b4c.zip frameworks_base-0b7f5e81ba06f694df8c8cccaea9e009e3200b4c.tar.gz frameworks_base-0b7f5e81ba06f694df8c8cccaea9e009e3200b4c.tar.bz2 | |
Modify getDeviceId() to get device id independent of Subscription.
+ Add getDeviceId() in ITelephony to find device id independent of
subscription.
Bug: 18780202
Change-Id: I21cc38418eb7f4f1b300c6372e1dc7548385c112
Diffstat (limited to 'telephony/java/android')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 99d0af1..9df693c 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -620,7 +620,11 @@ public class TelephonyManager { * {@link android.Manifest.permission#READ_PHONE_STATE READ_PHONE_STATE} */ public String getDeviceId() { - return getDeviceId(getDefaultSim()); + try { + return getITelephony().getDeviceId(); + } catch (RemoteException ex) { + return null; + } } /** |