Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: 4322c8d

* commit '4322c8d54ef935a3224c8fcbf7ab55ac48f34f1b':
  Fix incorrect condition for sub id check.
This commit is contained in:
Shishir Agrawal
2015-03-03 03:11:47 +00:00
committed by android-build-merger
parent 969b027852 4322c8d54e
commit 335b59f847
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/TelephonyRegistry.java
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));