commit ae0edf8cec65a168c4765c6eb08a6dc16c4aab05
author The Android Automerger <android-build@google.com> Mon Apr 20 09:11:39 2015 -0700
committer The Android Automerger <android-build@google.com> Mon Apr 20 09:11:39 2015 -0700
tree f46cb14c8476bb83200680cb6580f7188ace6c1d
parent 51c23674ab6340d7a2f2be6b3ff515e7033e118a
parent 154c507e52ed0de349fd667d1ededd37e7cc72a5

merge in lmp-mr1-nova-release history after reset to lmp-mr1-dev

services/core/java/com/android/server/TelephonyRegistry.java

diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index 4fbf23b..8d7a182 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -259,7 +259,7 @@
                         + 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));