diff options
| author | 2020-12-22 15:12:51 -0800 | |
|---|---|---|
| committer | 2020-12-29 13:33:15 -0800 | |
| commit | 1befe1a2b293c70d99c8b2cb5002b308e48a0635 (patch) | |
| tree | eb931e82c66e786b20f49bd57e84909685c0983d | |
| parent | d2d9390ffd34d6948b36ac0c4cc7ab4c7d9b8ad1 (diff) | |
Use a consistent logging string for the xms message id
Test: Manually tested sending/receiving SMSs and MMSs
Change-Id: I1da954eaeb482bca3d1b5168118fe57c592927e6
| -rw-r--r-- | telephony/java/android/telephony/SmsManager.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index e145fcfa2dff..e06dcdb7e736 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -638,7 +638,7 @@ public final class SmsManager { persistMessage, messageId); } catch (RemoteException e) { Log.e(TAG, "sendTextMessageInternal: Couldn't send SMS, exception - " - + e.getMessage() + " id: " + messageId); + + e.getMessage() + " " + formatCrossStackMessageId(messageId)); notifySmsError(sentIntent, RESULT_REMOTE_EXCEPTION); } } @@ -658,7 +658,7 @@ public final class SmsManager { persistMessage, messageId); } catch (RemoteException e) { Log.e(TAG, "sendTextMessageInternal (no persist): Couldn't send SMS, exception - " - + e.getMessage() + " id: " + messageId); + + e.getMessage() + " " + formatCrossStackMessageId(messageId)); notifySmsError(sentIntent, RESULT_REMOTE_EXCEPTION); } } @@ -1072,8 +1072,7 @@ public final class SmsManager { deliveryIntents, persistMessage, messageId); } catch (RemoteException e) { Log.e(TAG, "sendMultipartTextMessageInternal: Couldn't send SMS - " - + e.getMessage() + " id: " - + messageId); + + e.getMessage() + " " + formatCrossStackMessageId(messageId)); notifySmsError(sentIntents, RESULT_REMOTE_EXCEPTION); } } @@ -1094,7 +1093,7 @@ public final class SmsManager { } } catch (RemoteException e) { Log.e(TAG, "sendMultipartTextMessageInternal: Couldn't send SMS - " - + e.getMessage() + " id: " + messageId); + + e.getMessage() + " " + formatCrossStackMessageId(messageId)); notifySmsError(sentIntents, RESULT_REMOTE_EXCEPTION); } } @@ -3150,4 +3149,8 @@ public final class SmsManager { ex.rethrowFromSystemServer(); } } + + private static String formatCrossStackMessageId(long id) { + return "{x-message-id:" + id + "}"; + } } |