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

Commit ae784315 authored by Utkarsh Nigam's avatar Utkarsh Nigam
Browse files

Make onExecuteAppFunction non-abstract and remove timeout results. 

This is required so g3 usages can stop overriding this deprecated method and the timeout logic was removed in ag/29477656


Change-Id: Icd07685ea296403b48f4c3cbd74c2e7c3ad28430
Flag: android.app.appfunctions.flags.enable_app_function_manager
Test: atest CtsAppFunctionTestCases -c
Bug: 360864791
parent 5495a2b5

core/api/current.txt

+3 −4
Original line number Diff line number Diff line
@@ -8787,7 +8787,7 @@ package android.app.appfunctions { 
  @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public abstract class AppFunctionService extends android.app.Service {

    ctor public AppFunctionService();

    method @NonNull public final android.os.IBinder onBind(@Nullable android.content.Intent);

    method @Deprecated @MainThread public abstract void onExecuteFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull java.util.function.Consumer<android.app.appfunctions.ExecuteAppFunctionResponse>);

    method @Deprecated @MainThread public void onExecuteFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull java.util.function.Consumer<android.app.appfunctions.ExecuteAppFunctionResponse>);

    method @MainThread public void onExecuteFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<android.app.appfunctions.ExecuteAppFunctionResponse>);

    field @NonNull public static final String SERVICE_INTERFACE = "android.app.appfunctions.AppFunctionService";

  }
@@ -8822,13 +8822,12 @@ package android.app.appfunctions { 
    field @NonNull public static final android.os.Parcelable.Creator<android.app.appfunctions.ExecuteAppFunctionResponse> CREATOR;

    field public static final String PROPERTY_RETURN_VALUE = "returnValue";

    field public static final int RESULT_APP_UNKNOWN_ERROR = 2; // 0x2

    field public static final int RESULT_CANCELLED = 7; // 0x7

    field public static final int RESULT_CANCELLED = 6; // 0x6

    field public static final int RESULT_DENIED = 1; // 0x1

    field public static final int RESULT_DISABLED = 6; // 0x6

    field public static final int RESULT_DISABLED = 5; // 0x5

    field public static final int RESULT_INTERNAL_ERROR = 3; // 0x3

    field public static final int RESULT_INVALID_ARGUMENT = 4; // 0x4

    field public static final int RESULT_OK = 0; // 0x0

    field public static final int RESULT_TIMED_OUT = 5; // 0x5

  }















}

























core/java/android/app/appfunctions/AppFunctionService.java



+7
−2




























Original line number
Diff line number
Diff line








@@ -35,6 +35,7 @@ import android.os.ICancellationSignal;













import android.os.CancellationSignal;















import android.os.RemoteCallback;















import android.os.RemoteException;













import android.util.Log;































import java.util.function.Consumer;


























@@ -166,9 +167,13 @@ public abstract class AppFunctionService extends Service {













     */















    @MainThread















    @Deprecated













    public abstract void onExecuteFunction(













    public void onExecuteFunction(















            @NonNull ExecuteAppFunctionRequest request,













            @NonNull Consumer<ExecuteAppFunctionResponse> callback);













            @NonNull Consumer<ExecuteAppFunctionResponse> callback) {













        Log.w(













                "AppFunctionService",













                "Calling deprecated default implementation of onExecuteFunction");













    }































    /**















     * Called by the system to execute a specific app function.

































core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java



+2
−6




























Original line number
Diff line number
Diff line








@@ -96,17 +96,14 @@ public final class ExecuteAppFunctionResponse implements Parcelable {













     */















    public static final int RESULT_INVALID_ARGUMENT = 4;





























    /** The operation was timed out. */













    public static final int RESULT_TIMED_OUT = 5;





























    /** The caller tried to execute a disabled app function. */













    public static final int RESULT_DISABLED = 6;













    public static final int RESULT_DISABLED = 5;































    /**















     * The operation was cancelled. Use this error code to report that a cancellation is done after















     * receiving a cancellation signal.















     */













    public static final int RESULT_CANCELLED = 7;













    public static final int RESULT_CANCELLED = 6;































    /** The result code of the app function execution. */















    @ResultCode private final int mResultCode;










@@ -282,7 +279,6 @@ public final class ExecuteAppFunctionResponse implements Parcelable {













                RESULT_APP_UNKNOWN_ERROR,















                RESULT_INTERNAL_ERROR,















                RESULT_INVALID_ARGUMENT,













                RESULT_TIMED_OUT,















                RESULT_DISABLED,















                RESULT_CANCELLED















            })

































libs/appfunctions/api/current.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -16,7 +16,7 @@ package com.google.android.appfunctions.sidecar {













    ctor public AppFunctionService();















    method @NonNull public final android.os.IBinder onBind(@Nullable android.content.Intent);















    method @MainThread public void onExecuteFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse>);













    method @Deprecated @MainThread public abstract void onExecuteFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull java.util.function.Consumer<com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse>);













    method @Deprecated @MainThread public void onExecuteFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull java.util.function.Consumer<com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse>);















    field @NonNull public static final String BIND_APP_FUNCTION_SERVICE = "android.permission.BIND_APP_FUNCTION_SERVICE";















    field @NonNull public static final String SERVICE_INTERFACE = "android.app.appfunctions.AppFunctionService";















  }










@@ -45,12 +45,12 @@ package com.google.android.appfunctions.sidecar {













    method @NonNull public static com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse newSuccess(@NonNull android.app.appsearch.GenericDocument, @Nullable android.os.Bundle);















    field public static final String PROPERTY_RETURN_VALUE = "returnValue";















    field public static final int RESULT_APP_UNKNOWN_ERROR = 2; // 0x2













    field public static final int RESULT_CANCELLED = 6; // 0x6















    field public static final int RESULT_DENIED = 1; // 0x1













    field public static final int RESULT_DISABLED = 6; // 0x6













    field public static final int RESULT_DISABLED = 5; // 0x5















    field public static final int RESULT_INTERNAL_ERROR = 3; // 0x3















    field public static final int RESULT_INVALID_ARGUMENT = 4; // 0x4















    field public static final int RESULT_OK = 0; // 0x0













    field public static final int RESULT_TIMED_OUT = 5; // 0x5















  }































}

































libs/appfunctions/java/com/google/android/appfunctions/sidecar/AppFunctionService.java



+7
−2




























Original line number
Diff line number
Diff line








@@ -26,6 +26,7 @@ import android.content.Intent;













import android.os.Binder;















import android.os.IBinder;















import android.os.CancellationSignal;













import android.util.Log;































import java.util.function.Consumer;


























@@ -143,7 +144,11 @@ public abstract class AppFunctionService extends Service {













     */















    @MainThread















    @Deprecated













    public abstract void onExecuteFunction(













    public void onExecuteFunction(















            @NonNull ExecuteAppFunctionRequest request,













            @NonNull Consumer<ExecuteAppFunctionResponse> callback);













            @NonNull Consumer<ExecuteAppFunctionResponse> callback) {













        Log.w(













                "AppFunctionService",













                "Calling deprecated default implementation of onExecuteFunction");













    }















}