diff options
| author | Shishir Agrawal <shishir@google.com> | 2015-03-03 02:54:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-03 02:54:12 +0000 |
| commit | 4322c8d54ef935a3224c8fcbf7ab55ac48f34f1b (patch) | |
| tree | 5abed6ec90710c790215eab50d9a3bf771a217c6 /services | |
| parent | 2b24d07a87513f3c547a5c279b9b3b5160cec7f0 (diff) | |
| parent | bcced5b834e49bf3a0b57a0009958ba061d31e76 (diff) | |
| download | frameworks_base-4322c8d54ef935a3224c8fcbf7ab55ac48f34f1b.zip frameworks_base-4322c8d54ef935a3224c8fcbf7ab55ac48f34f1b.tar.gz frameworks_base-4322c8d54ef935a3224c8fcbf7ab55ac48f34f1b.tar.bz2 | |
am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev
* commit 'bcced5b834e49bf3a0b57a0009958ba061d31e76':
Fix incorrect condition for sub id check.
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/TelephonyRegistry.java | 2 |
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 8d7a182..4fbf23b 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)); |