commit f1d6a307f9092385d27abc6491d17cdaed323f76
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 22 20:45:06 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 22 20:45:06 2021 +0000
tree 25d0ef99a504c5f98a5d7f51b7c28275d2f9ac2c
parent df499cc46bbb3b2f25952a69d1876ec207b1e7ef
parent a96a2c4e1905df73d69547283be92baba81197e8

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

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

Change-Id: I561bdef07f9d82f1333008dfbb8f9debced68c32

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 1ae8641..712b9ba 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())) {