filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 22d93c0406

Change-Id: Iea7391e23e36fd7a9d7c449457f46743315458c3
This commit is contained in:
Taesu Lee
2019-07-03 16:35:23 -07:00
committed by android-build-merger
parent 336a8d81ab 22d93c0406
commit 0512d2078e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/receiver/SendStatusReceiver.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class SendStatusReceiver extends BroadcastReceiver {
public static final String EXTRA_PART_ID = "partId"; public static final String EXTRA_PART_ID = "partId";
public static final String EXTRA_SUB_ID = "subId"; 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; public static final int NO_PART_ID = -1;
@Override @Override
src/com/android/messaging/receiver/SmsReceiver.java
+2 -1
View File
@@ -186,7 +186,8 @@ public final class SmsReceiver extends BroadcastReceiver {
return; 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 // Always convert negative subIds into -1
int subId = PhoneUtils.getDefault().getEffectiveIncomingSubIdFromSystem( int subId = PhoneUtils.getDefault().getEffectiveIncomingSubIdFromSystem(
intent, EXTRA_SUB_ID); intent, EXTRA_SUB_ID);