commit 7af6fdf128430290df6ed3085ff22b3e9560c12c
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 22 20:18:36 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 22 20:18:36 2021 +0000
tree dd75e665c3bccbdb2819f94070377de9a5094680
parent 4ce834a02070c31d9c2027bbaf5b09551f06d29a
parent 692a877db4b7eb01f1c093d359c0736465d59472

Merge "Check calling package before checking permission protection" into sc-dev

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())) {