diff options
author | Michael W <baddaemon87@gmail.com> | 2016-11-18 13:49:00 +0100 |
---|---|---|
committer | Michael W <baddaemon87@gmail.com> | 2016-11-18 13:49:00 +0100 |
commit | c25973a97a0017ae3cbe1e943f0d675e7a40ebdf (patch) | |
tree | fb7e7566f8c13e0bc72084d5cf4f0bcfaa91ad8a | |
parent | afcb74c49c0e9366cf46be0d73137e927abc826e (diff) | |
download | android_packages_apps_Messaging-c25973a97a0017ae3cbe1e943f0d675e7a40ebdf.tar.gz android_packages_apps_Messaging-c25973a97a0017ae3cbe1e943f0d675e7a40ebdf.tar.bz2 android_packages_apps_Messaging-c25973a97a0017ae3cbe1e943f0d675e7a40ebdf.zip |
Messaging: Fix incorrect equality check
The change
https://review.cyanogenmod.org/#/c/163343/
introduced an incorrect equality check resulting in sms not being sent
when sms preference is set to "Always choose".
Correctly use equals() to fix this issue.
Change-Id: Ic1a4667163c8da5c3e2108e460c25c07e0903241
-rw-r--r-- | src/com/android/messaging/ui/conversation/ComposeMessageView.java | 2 | ||||
-rwxr-xr-x | src/com/cyanogenmod/messaging/quickmessage/QuickMessagePopup.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/messaging/ui/conversation/ComposeMessageView.java b/src/com/android/messaging/ui/conversation/ComposeMessageView.java index ae1bbec..ffec347 100644 --- a/src/com/android/messaging/ui/conversation/ComposeMessageView.java +++ b/src/com/android/messaging/ui/conversation/ComposeMessageView.java @@ -253,7 +253,7 @@ public class ComposeMessageView extends LinearLayout int subId = 0; // defaulting to 0, just in case while (phoneAccounts.hasNext()) { PhoneAccountHandle p = phoneAccounts.next(); - if (p.getId() == selectedAccountHandle.getId()) { + if (p.getId().equals(selectedAccountHandle.getId())) { PhoneAccount phoneAccount = telecomMgr.getPhoneAccount(p); subId = telephonyManager.getSubIdForPhoneAccount(phoneAccount); } diff --git a/src/com/cyanogenmod/messaging/quickmessage/QuickMessagePopup.java b/src/com/cyanogenmod/messaging/quickmessage/QuickMessagePopup.java index 0bf8b7f..b5f7918 100755 --- a/src/com/cyanogenmod/messaging/quickmessage/QuickMessagePopup.java +++ b/src/com/cyanogenmod/messaging/quickmessage/QuickMessagePopup.java @@ -410,7 +410,7 @@ public class QuickMessagePopup extends Activity { int subId = 0; // defaulting to 0, just in case while (phoneAccounts.hasNext()) { PhoneAccountHandle p = phoneAccounts.next(); - if (p.getId() == selectedAccountHandle.getId()) { + if (p.getId().equals(selectedAccountHandle.getId())) { PhoneAccount phoneAccount = telecomMgr.getPhoneAccount(p); subId = telephonyManager.getSubIdForPhoneAccount(phoneAccount); } |