Messaging: Fix incorrect equality checkstable/cm-13.0-ZNH5Y

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.

RM-290

Change-Id: Ic1a4667163c8da5c3e2108e460c25c07e0903241

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);
                             }