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

am: b7f93e6f10

Change-Id: I0e3d28d6d8849bd855b057aceaedf19f54d52171

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

@@ -52,7 +52,7 @@ public class SendStatusReceiver extends BroadcastReceiver {
     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

@@ -186,7 +186,8 @@ public final class SmsReceiver extends BroadcastReceiver {
             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);