diff options
| author | Wink Saville <wink@google.com> | 2011-02-01 21:02:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-01 21:02:10 -0800 |
| commit | 1bf518d8b333768e26bacf340f88f7d4ba8b9a91 (patch) | |
| tree | cb884100d4d2964fd78b39526c8464ce7ea6b553 /core | |
| parent | 46ab5e13f27324d634ff27b7fd75c5d432b915bf (diff) | |
| parent | 9d72be33181f1bd1386017ce0b0ce17d8ce1cb66 (diff) | |
| download | frameworks_base-1bf518d8b333768e26bacf340f88f7d4ba8b9a91.zip frameworks_base-1bf518d8b333768e26bacf340f88f7d4ba8b9a91.tar.gz frameworks_base-1bf518d8b333768e26bacf340f88f7d4ba8b9a91.tar.bz2 | |
Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/accounts/AccountManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java index fb16609..2e70a56 100644 --- a/core/java/android/accounts/AccountManagerService.java +++ b/core/java/android/accounts/AccountManagerService.java @@ -1781,7 +1781,7 @@ public class AccountManagerService // will return a different value, but we *don't* erase the // passwords. We only erase them if it has a different // subscriber ID once it's provisioned. - if (telephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) { + if (telephonyManager.getCurrentPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) { IBinder service = ServiceManager.checkService(Context.TELEPHONY_SERVICE); if (service == null) { Log.w(TAG, "call to checkService(TELEPHONY_SERVICE) failed"); |