commit 1f5dc8ee721fcd1e725321d728b65d44ec2a08ec
author Utkarsh Nigam <utkarshnigam@google.com> Fri Sep 13 07:38:51 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 13 07:38:51 2024 +0000
tree 8b77ed1595080ee26e84d61bdbeb8a692ff34487
parent 00cf61a13e739566fbee34cd738ae76eb0444a3c
parent 58b799a7251c8c7719df8a9ae0906505fd09e444

Merge "Return early when the caller doesn't have any permission." into main

services/appfunctions/java/com/android/server/appfunctions/CallerValidatorImpl.java

diff --git a/services/appfunctions/java/com/android/server/appfunctions/CallerValidatorImpl.java b/services/appfunctions/java/com/android/server/appfunctions/CallerValidatorImpl.java
index c4ccdd8..94a63b4 100644
--- a/services/appfunctions/java/com/android/server/appfunctions/CallerValidatorImpl.java
+++ b/services/appfunctions/java/com/android/server/appfunctions/CallerValidatorImpl.java
@@ -112,6 +112,10 @@
                 mContext.checkPermission(Manifest.permission.EXECUTE_APP_FUNCTIONS, pid, uid)
                         == PackageManager.PERMISSION_GRANTED;
 
+        if (!hasExecutionPermission) {
+            return AndroidFuture.completedFuture(false);
+        }
+
         final long token = Binder.clearCallingIdentity();
         try {
             FutureAppSearchSession futureAppSearchSession =