summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunda Liu <junda@google.com>2015-02-23 16:06:51 -0800
committerThe Android Automerger <android-build@google.com>2015-04-20 09:20:43 -0700
commit69f29104024e5b2a56ede65cdc6a3c8590b3150a (patch)
treecf1ef97f192a154d76271f3876ff44e4c8a770af
parentae0edf8cec65a168c4765c6eb08a6dc16c4aab05 (diff)
downloadbase-69f29104024e5b2a56ede65cdc6a3c8590b3150a.tar.gz
Fix incorrect condition for sub id check.android-5.1.1_r8
Bug: b/19277299 Change-Id: Iea6806926f0e9d9404a3f2613d03b8a0607fea54
-rw-r--r--services/core/java/com/android/server/TelephonyRegistry.java2
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 8d7a182d5669..4fbf23bde324 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));