Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use a consistent logging string for the xms message id"

Browse Source
This commit is contained in:
Tom Taylor
2021-01-05 18:44:48 +00:00
committed by Android (Google) Code Review
parent 0653eec119 1befe1a2b2
commit bf36a7f543
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telephony/java/android/telephony/SmsManager.java
View File

@@ -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 + "}";
}
}