| commit | b06eb3a0d3c7412e6729fd49075a1f2f03d8fe85 | [log] [tgz] |
|---|---|---|
| author | Taesu Lee <taesu82.lee@samsung.com> | Wed Jul 03 17:23:04 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 03 17:23:04 2019 -0700 |
| tree | 4e269655af56e67ccc55260c34dda44c55e39fe4 | |
| parent | 97041a8763e8b5010575ca5e25315db7979be9ec [diff] | |
| parent | 0512d2078e57c1fc9ac79946883bbfb2077a7782 [diff] |
Merge "Replace no error code '0' for SMS with '-1'" am: b7f93e6f10 am: 22d93c0406 am: 0512d2078e Change-Id: Ie3a7cf3f1692be15de61b79f67e1291bc39a15be
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
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);