Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acdf0735 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Return early on "cannot execute function"" into main

parents 04f82f97 67b293f4

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -65,8 +65,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.infra.AndroidFuture;

import com.android.internal.infra.AndroidFuture;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.DumpUtils;

import com.android.server.SystemService.TargetUser;

import com.android.server.SystemService.TargetUser;

import com.android.server.appfunctions.RemoteServiceCaller.RunServiceCallCallback;

import com.android.server.appfunctions.RemoteServiceCaller.ServiceUsageCompleteListener;





import java.io.FileDescriptor;

import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.io.PrintWriter;
@@ -233,6 +231,9 @@ public class AppFunctionManagerServiceImpl extends IAppFunctionManager.Stub { 
                                                "Caller does not have permission to execute the"

                                                "Caller does not have permission to execute the"

                                                        + " appfunction",

                                                        + " appfunction",

                                                /* extras= */ null));

                                                /* extras= */ null));

                                throw new SecurityException(

                                        "Caller does not have permission to execute the"

                                                + " appfunction");

                            }

                            }

                        })

                        })

                .thenCompose(

                .thenCompose(
@@ -380,7 +381,8 @@ public class AppFunctionManagerServiceImpl extends IAppFunctionManager.Stub { 
                                    runtimeMetadataSearchSession));

                                    runtimeMetadataSearchSession));

            AppFunctionRuntimeMetadata newMetadata =

            AppFunctionRuntimeMetadata newMetadata =

                    new AppFunctionRuntimeMetadata.Builder(existingMetadata)

                    new AppFunctionRuntimeMetadata.Builder(existingMetadata)

                            .setEnabled(enabledState).build();

                            .setEnabled(enabledState)

                            .build();

            AppSearchBatchResult<String, Void> putDocumentBatchResult =

            AppSearchBatchResult<String, Void> putDocumentBatchResult =

                    runtimeMetadataSearchSession

                    runtimeMetadataSearchSession

                            .put(

                            .put(