Fix incorrect condition for sub id check.

Junda Liu · The Android Automerger · commit 154c507e52ed · 2015-04-13T20:25:49.000-07:00
Bug: b/19277299
Change-Id: Iea6806926f0e9d9404a3f2613d03b8a0607fea54
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -259,7 +259,7 @@ public void onReceive(Context context, Intent intent) {
                         + 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));

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ public void onReceive(Context context, Intent intent) {`
`259`	`259`	`+ newDefaultSubIdObj + " newDefaultPhoneId=" + newDefaultPhoneId);`
`260`	`260`	`}`
`261`	`261`
`262`		`- if(validatePhoneId(newDefaultPhoneId) && (newDefaultSubIdObj.equals(mDefaultSubId)`
	`262`	`+ if(validatePhoneId(newDefaultPhoneId) && (!newDefaultSubIdObj.equals(mDefaultSubId)`
`263`	`263`	`\|\| (newDefaultPhoneId != mDefaultPhoneId))) {`
`264`	`264`	`mHandler.sendMessage(mHandler.obtainMessage(MSG_UPDATE_DEFAULT_SUB,`
`265`	`265`	`newDefaultPhoneId, 0, newDefaultSubIdObj));`