summaryrefslogtreecommitdiff
path: root/services/appfunctions/java
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-10-10 00:43:11 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-10-10 00:43:11 +0000
commitd2d7bcfde61848faf3b149f605cb2a5c7b60b54b (patch)
treecb1f7936b91dc3f2436db45ad6faf6ce253476bc /services/appfunctions/java
parentcd85368b03979aec9d87809ad108021b94fc2196 (diff)
parentd24ae5991d0dfe0fca7e67c890e8c5a9dd32f942 (diff)
Merge "Add calling package onExecuteAppFunction" into main
Diffstat (limited to 'services/appfunctions/java')
-rw-r--r--services/appfunctions/java/com/android/server/appfunctions/AppFunctionManagerServiceImpl.java2
-rw-r--r--services/appfunctions/java/com/android/server/appfunctions/RunAppFunctionServiceCallback.java22
2 files changed, 5 insertions, 19 deletions
diff --git a/services/appfunctions/java/com/android/server/appfunctions/AppFunctionManagerServiceImpl.java b/services/appfunctions/java/com/android/server/appfunctions/AppFunctionManagerServiceImpl.java
index 6d350e6b2a4a..c5fef191c52c 100644
--- a/services/appfunctions/java/com/android/server/appfunctions/AppFunctionManagerServiceImpl.java
+++ b/services/appfunctions/java/com/android/server/appfunctions/AppFunctionManagerServiceImpl.java
@@ -441,7 +441,7 @@ public class AppFunctionManagerServiceImpl extends IAppFunctionManager.Stub {
targetUser,
mServiceConfig.getExecuteAppFunctionCancellationTimeoutMillis(),
cancellationSignal,
- RunAppFunctionServiceCallback.create(
+ new RunAppFunctionServiceCallback(
requestInternal,
cancellationCallback,
safeExecuteAppFunctionCallback),
diff --git a/services/appfunctions/java/com/android/server/appfunctions/RunAppFunctionServiceCallback.java b/services/appfunctions/java/com/android/server/appfunctions/RunAppFunctionServiceCallback.java
index 7820390dd544..129be65f3153 100644
--- a/services/appfunctions/java/com/android/server/appfunctions/RunAppFunctionServiceCallback.java
+++ b/services/appfunctions/java/com/android/server/appfunctions/RunAppFunctionServiceCallback.java
@@ -27,17 +27,17 @@ import android.util.Slog;
import com.android.server.appfunctions.RemoteServiceCaller.RunServiceCallCallback;
import com.android.server.appfunctions.RemoteServiceCaller.ServiceUsageCompleteListener;
-
/**
* A callback to forward a request to the {@link IAppFunctionService} and report back the result.
*/
public class RunAppFunctionServiceCallback implements RunServiceCallCallback<IAppFunctionService> {
+ private static final String TAG = RunAppFunctionServiceCallback.class.getSimpleName();
private final ExecuteAppFunctionAidlRequest mRequestInternal;
private final SafeOneTimeExecuteAppFunctionCallback mSafeExecuteAppFunctionCallback;
private final ICancellationCallback mCancellationCallback;
- private RunAppFunctionServiceCallback(
+ public RunAppFunctionServiceCallback(
ExecuteAppFunctionAidlRequest requestInternal,
ICancellationCallback cancellationCallback,
SafeOneTimeExecuteAppFunctionCallback safeExecuteAppFunctionCallback) {
@@ -46,21 +46,6 @@ public class RunAppFunctionServiceCallback implements RunServiceCallCallback<IAp
this.mCancellationCallback = cancellationCallback;
}
- /**
- * Creates a new instance of {@link RunAppFunctionServiceCallback}.
- *
- * @param requestInternal a request to send to the service.
- * @param cancellationCallback a callback to forward cancellation signal to the service.
- * @param safeExecuteAppFunctionCallback a callback to report back the result of the operation.
- */
- public static RunAppFunctionServiceCallback create(
- ExecuteAppFunctionAidlRequest requestInternal,
- ICancellationCallback cancellationCallback,
- SafeOneTimeExecuteAppFunctionCallback safeExecuteAppFunctionCallback) {
- return new RunAppFunctionServiceCallback(
- requestInternal, cancellationCallback, safeExecuteAppFunctionCallback);
- }
-
@Override
public void onServiceConnected(
@NonNull IAppFunctionService service,
@@ -68,6 +53,7 @@ public class RunAppFunctionServiceCallback implements RunServiceCallCallback<IAp
try {
service.executeAppFunction(
mRequestInternal.getClientRequest(),
+ mRequestInternal.getCallingPackage(),
mCancellationCallback,
new IExecuteAppFunctionCallback.Stub() {
@Override
@@ -88,7 +74,7 @@ public class RunAppFunctionServiceCallback implements RunServiceCallCallback<IAp
@Override
public void onFailedToConnect() {
- Slog.e("AppFunctionManagerServiceImpl", "Failed to connect to service");
+ Slog.e(TAG, "Failed to connect to service");
mSafeExecuteAppFunctionCallback.onResult(
ExecuteAppFunctionResponse.newFailure(
ExecuteAppFunctionResponse.RESULT_APP_UNKNOWN_ERROR,