diff options
| author | Shishir Agrawal <shishir@google.com> | 2015-03-02 22:32:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-02 22:32:17 +0000 |
| commit | bcced5b834e49bf3a0b57a0009958ba061d31e76 (patch) | |
| tree | b14b0ae809a10a475cf3e524986ea54250caf5a5 | |
| parent | f2c1c09683a5cfa23e8394fe5a10e84803f4168b (diff) | |
| parent | 985f52cde55a3b1b72d3fc73ffe67005d1906438 (diff) | |
| download | frameworks_base-bcced5b834e49bf3a0b57a0009958ba061d31e76.zip frameworks_base-bcced5b834e49bf3a0b57a0009958ba061d31e76.tar.gz frameworks_base-bcced5b834e49bf3a0b57a0009958ba061d31e76.tar.bz2 | |
Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
| -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)); |