diff options
| author | 2021-01-05 18:44:48 +0000 | |
|---|---|---|
| committer | 2021-01-05 18:44:48 +0000 | |
| commit | bf36a7f543a793e1e4cd8ca505990bcf8a8a4f17 (patch) | |
| tree | 401e37d9852c911f352240c164b2d9a2ba1ba97b | |
| parent | 0653eec1190f3b76d291e85367adf06c741cc24d (diff) | |
| parent | 1befe1a2b293c70d99c8b2cb5002b308e48a0635 (diff) | |
Merge "Use a consistent logging string for the xms message id"
| -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 + "}"; + } } |