From da8b67be0cc0629ab5777cf8aaed393d9f8e2e6c Mon Sep 17 00:00:00 2001 From: Taesu Lee Date: Wed, 8 Feb 2017 14:43:18 +0900 Subject: [PATCH] Replace no error code '0' for SMS with '-1' Use '-1' for no error instead of '0' since the '0' has been one of the valid error codes in 3GPP2. Test: Manual Change-Id: I02ba391a5cd178491868565c10bb3a35ba88e19a Signed-off-by: Taesu Lee --- src/com/android/messaging/receiver/SendStatusReceiver.java | 2 +- src/com/android/messaging/receiver/SmsReceiver.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 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 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 @@ 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);