diff options
author | Aishwarya Mallampati <amallampati@google.com> | 2024-02-12 19:00:27 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-02-12 19:00:27 +0000 |
commit | 34573462f4fbad6d673325fc336faa2bfb6c22aa (patch) | |
tree | 9d82e69bc4eed45ab9679c5d15d5739220026e08 | |
parent | 7f28fd57b20e663a2ad91259c72aa521a91e4694 (diff) | |
parent | d9db861b6e4426d435e5f49bcb9384ec6f50c905 (diff) | |
download | telephony-34573462f4fbad6d673325fc336faa2bfb6c22aa.tar.gz |
Merge "Clear calling identity before calling getSubscriptionUserHandle" into main
-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 a78242ad5a..5df9f0890e 100644 --- a/src/java/com/android/internal/telephony/SMSDispatcher.java +++ b/src/java/com/android/internal/telephony/SMSDispatcher.java @@ -2466,7 +2466,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); |