commit bc4a330bb42a6e28dedecfd2511853d2de5f9d8a
author Wink Saville <wink@google.com> Fri Dec 12 04:37:42 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 12 04:37:42 2014 +0000
tree 9e98ac8dfb819027b9d608cd38c2ab98c8b87aad
parent 933e1e0fefa23a84518c70991355f91dc4da7408
parent fe363344269905f5ec433144f3590eeacd58f4b7

am fe363344: Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

* commit 'fe363344269905f5ec433144f3590eeacd58f4b7':
  Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

src/com/android/server/telecom/RespondViaSmsManager.java

diff --git a/src/com/android/server/telecom/RespondViaSmsManager.java b/src/com/android/server/telecom/RespondViaSmsManager.java
index 8164df0..1e84613 100644
--- a/src/com/android/server/telecom/RespondViaSmsManager.java
+++ b/src/com/android/server/telecom/RespondViaSmsManager.java
@@ -191,7 +191,7 @@
                 final Uri uri = Uri.fromParts(Constants.SCHEME_SMSTO, phoneNumber, null);
                 final Intent intent = new Intent(TelephonyManager.ACTION_RESPOND_VIA_MESSAGE, uri);
                 intent.putExtra(Intent.EXTRA_TEXT, textMessage);
-                if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                if (SubscriptionManager.isValidSubscriptionId(subId)) {
                     intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
                 }