diff options
| author | Shishir Agrawal <shishir@google.com> | 2015-03-02 22:48:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-02 22:48:11 +0000 |
| commit | c8e3784e259a1c668193a6590570847c9cd9310b (patch) | |
| tree | ec962168a1ff44329993835cd286ffedd676f97a | |
| parent | fb96187bb6004e5d0b22e4d942aa236a08d8913b (diff) | |
| parent | 20a5df6205c3d57bfcb5b8e1454fb88c638c8ae3 (diff) | |
| download | frameworks_base-c8e3784e259a1c668193a6590570847c9cd9310b.zip frameworks_base-c8e3784e259a1c668193a6590570847c9cd9310b.tar.gz frameworks_base-c8e3784e259a1c668193a6590570847c9cd9310b.tar.bz2 | |
am 20a5df62: am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
* commit '20a5df6205c3d57bfcb5b8e1454fb88c638c8ae3':
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 8d7a182..4fbf23b 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)); |