am c8e3784e: am 20a5df62: am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev

* commit 'c8e3784e259a1c668193a6590570847c9cd9310b':
  Fix incorrect condition for sub id check.
This commit is contained in:
Shishir Agrawal
2015-03-02 22:54:59 +00:00
committed by Android Git Automerger

View File

@@ -259,7 +259,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
+ newDefaultSubIdObj + " newDefaultPhoneId=" + newDefaultPhoneId); + newDefaultSubIdObj + " newDefaultPhoneId=" + newDefaultPhoneId);
} }
if(validatePhoneId(newDefaultPhoneId) && (newDefaultSubIdObj.equals(mDefaultSubId) if(validatePhoneId(newDefaultPhoneId) && (!newDefaultSubIdObj.equals(mDefaultSubId)
|| (newDefaultPhoneId != mDefaultPhoneId))) { || (newDefaultPhoneId != mDefaultPhoneId))) {
mHandler.sendMessage(mHandler.obtainMessage(MSG_UPDATE_DEFAULT_SUB, mHandler.sendMessage(mHandler.obtainMessage(MSG_UPDATE_DEFAULT_SUB,
newDefaultPhoneId, 0, newDefaultSubIdObj)); newDefaultPhoneId, 0, newDefaultSubIdObj));