commit 2fb9a8f6773dc939f4eb4d08128f9bf69c946a33
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 22 20:33:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 22 20:33:28 2021 +0000
tree dd75e665c3bccbdb2819f94070377de9a5094680
parent a72e43b2ac346ae7c396b417ce22dc0534f48e20
parent 7af6fdf128430290df6ed3085ff22b3e9560c12c

Merge "Check calling package before checking permission protection" into sc-dev am: 7af6fdf128

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/15288710

Change-Id: Iab15d20cd5c71b800793deaeaf8c0c41354bbbae

src/com/android/server/telecom/TelecomServiceImpl.java

diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index 6fb2897..0037aaf 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -948,6 +948,7 @@
         public int getCallStateUsingPackage(String callingPackage, String callingFeatureId) {
             try {
                 Log.startSession("TSI.getCallStateUsingPackage");
+                enforceCallingPackage(callingPackage);
                 if (CompatChanges.isChangeEnabled(
                         TelecomManager.ENABLE_GET_CALL_STATE_PERMISSION_PROTECTION, callingPackage,
                         Binder.getCallingUserHandle())) {