Clear calling identity before sending text
Bug: 324459111
Test: build
Change-Id: Ic987500dfea848e02f553e6c681f360fc3e1d071
diff --git a/src/java/com/android/internal/telephony/SmsController.java b/src/java/com/android/internal/telephony/SmsController.java
index 32c7429..59184d8 100644
--- a/src/java/com/android/internal/telephony/SmsController.java
+++ b/src/java/com/android/internal/telephony/SmsController.java
@@ -302,16 +302,17 @@
SubscriptionInfo info;
try {
info = getSubscriptionInfo(subId);
+
+ if (isBluetoothSubscription(info)) {
+ sendBluetoothText(info, destAddr, text, sentIntent, deliveryIntent);
+ } else {
+ sendIccText(subId, callingPackage, destAddr, scAddr, text, sentIntent,
+ deliveryIntent, persistMessageForNonDefaultSmsApp, messageId,
+ skipShortCodeCheck);
+ }
} finally {
Binder.restoreCallingIdentity(token);
}
-
- if (isBluetoothSubscription(info)) {
- sendBluetoothText(info, destAddr, text, sentIntent, deliveryIntent);
- } else {
- sendIccText(subId, callingPackage, destAddr, scAddr, text, sentIntent, deliveryIntent,
- persistMessageForNonDefaultSmsApp, messageId, skipShortCodeCheck);
- }
}
private boolean isBluetoothSubscription(SubscriptionInfo info) {