diff options
author | Aishwarya Mallampati <amallampati@google.com> | 2024-02-12 19:34:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-12 19:34:39 +0000 |
commit | 84ea42d204e76e830085681f1abcc15108274110 (patch) | |
tree | ec923bc9db380a1479ecd146416686eea6f5344d | |
parent | 689cc6240b9877bc0b4818c2f5484e34c6320fc5 (diff) | |
parent | 34573462f4fbad6d673325fc336faa2bfb6c22aa (diff) | |
download | telephony-84ea42d204e76e830085681f1abcc15108274110.tar.gz |
Merge "Clear calling identity before calling getSubscriptionUserHandle" into main am: 34573462f4temp_319669529
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2957801
Change-Id: I866f9364f94a09466f6e021aa3b0f4f50a14f656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | src/java/com/android/internal/telephony/SMSDispatcher.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/SMSDispatcher.java b/src/java/com/android/internal/telephony/SMSDispatcher.java index 54c27c5be7..04f5c083ba 100644 --- a/src/java/com/android/internal/telephony/SMSDispatcher.java +++ b/src/java/com/android/internal/telephony/SMSDispatcher.java @@ -2544,7 +2544,13 @@ public abstract class SMSDispatcher extends Handler { /** Return if the SMS was originated from the default SMS application. */ public boolean isFromDefaultSmsApplication(Context context) { if (mIsFromDefaultSmsApplication == null) { - UserHandle userHandle = TelephonyUtils.getSubscriptionUserHandle(context, mSubId); + UserHandle userHandle; + final long identity = Binder.clearCallingIdentity(); + try { + userHandle = TelephonyUtils.getSubscriptionUserHandle(context, mSubId); + } finally { + Binder.restoreCallingIdentity(identity); + } // Perform a lazy initialization, due to the cost of the operation. mIsFromDefaultSmsApplication = SmsApplication.isDefaultSmsApplicationAsUser(context, getAppPackageName(), userHandle); |