commit b7f93e6f1082d4acd00a9cbe55ec8ebccdf4f8dd
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 03 18:08:28 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 03 18:08:28 2019 +0000
tree 9568a84597a50edf548f1a8ff70682bcb24e1858
parent db0b50238b1799ec9e2cbba1b527a3601adbeb8e
parent da8b67be0cc0629ab5777cf8aaed393d9f8e2e6c

Merge "Replace no error code '0' for SMS with '-1'"

src/com/android/messaging/receiver/SendStatusReceiver.java

diff --git a/src/com/android/messaging/receiver/SendStatusReceiver.java b/src/com/android/messaging/receiver/SendStatusReceiver.java
index 3af65f2..c1b2bca 100644
--- a/src/com/android/messaging/receiver/SendStatusReceiver.java
+++ b/src/com/android/messaging/receiver/SendStatusReceiver.java
@@ -52,7 +52,7 @@
     public static final String EXTRA_PART_ID = "partId";
     public static final String EXTRA_SUB_ID = "subId";
 
-    public static final int NO_ERROR_CODE = 0;
+    public static final int NO_ERROR_CODE = -1;
     public static final int NO_PART_ID = -1;
 
     @Override

src/com/android/messaging/receiver/SmsReceiver.java

diff --git a/src/com/android/messaging/receiver/SmsReceiver.java b/src/com/android/messaging/receiver/SmsReceiver.java
index b54359f..f1f9bcd 100644
--- a/src/com/android/messaging/receiver/SmsReceiver.java
+++ b/src/com/android/messaging/receiver/SmsReceiver.java
@@ -186,7 +186,8 @@
             return;
         }
 
-        final int errorCode = intent.getIntExtra(EXTRA_ERROR_CODE, 0);
+        final int errorCode =
+                intent.getIntExtra(EXTRA_ERROR_CODE, SendStatusReceiver.NO_ERROR_CODE);
         // Always convert negative subIds into -1
         int subId = PhoneUtils.getDefault().getEffectiveIncomingSubIdFromSystem(
                 intent, EXTRA_SUB_ID);