diff options
| author | Shishir Agrawal <shishir@google.com> | 2015-03-02 23:12:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-02 23:12:27 +0000 |
| commit | 95e25a6b3c8752ff9e5c984e711c2fc31a668c67 (patch) | |
| tree | e7d91681c32beb63720fa4ab2dd452ea2547b189 | |
| parent | 6672afbe7d84f2debcc712459d5415808cf59a57 (diff) | |
| parent | 06e9147d8a9e07aa06433f18323253f8659d27f9 (diff) | |
| download | frameworks_base-95e25a6b3c8752ff9e5c984e711c2fc31a668c67.zip frameworks_base-95e25a6b3c8752ff9e5c984e711c2fc31a668c67.tar.gz frameworks_base-95e25a6b3c8752ff9e5c984e711c2fc31a668c67.tar.bz2 | |
am 06e9147d: am c8e3784e: am 20a5df62: am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
* commit '06e9147d8a9e07aa06433f18323253f8659d27f9':
Fix incorrect condition for sub id check.
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java index 376ef2a..d153233 100644 --- a/services/core/java/com/android/server/TelephonyRegistry.java +++ b/services/core/java/com/android/server/TelephonyRegistry.java @@ -259,7 +259,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { + newDefaultSubIdObj + " newDefaultPhoneId=" + newDefaultPhoneId); } - if(validatePhoneId(newDefaultPhoneId) && (newDefaultSubIdObj.equals(mDefaultSubId) + if(validatePhoneId(newDefaultPhoneId) && (!newDefaultSubIdObj.equals(mDefaultSubId) || (newDefaultPhoneId != mDefaultPhoneId))) { mHandler.sendMessage(mHandler.obtainMessage(MSG_UPDATE_DEFAULT_SUB, newDefaultPhoneId, 0, newDefaultSubIdObj)); |