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

Commit c0c499e1 authored by Oluwarotimi Adesina's avatar Oluwarotimi Adesina Committed by Desh
Browse files

remame appfunction sidecar jar 

Flag: android.app.appfunctions.flags.enable_app_function_manager
Test: cts
Bug: 357551503
Change-Id: I19b5d9a0856429ad9b072aaa3f9b8e5a0dfde063
parent 08c469d5

libs/appfunctions/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ package { 
}



java_sdk_library {

    name: "com.google.android.appfunctions.sidecar",

    name: "com.android.extensions.appfunctions",

    owner: "google",

    srcs: ["java/**/*.java"],

    api_packages: ["com.google.android.appfunctions.sidecar"],

    api_packages: ["com.android.extensions.appfunctions"],

    dex_preopt: {

        enabled: false,

    },
@@ -31,9 +31,9 @@ java_sdk_library { 
}



prebuilt_etc {

    name: "appfunctions.sidecar.xml",

    name: "appfunctions.extension.xml",

    system_ext_specific: true,

    sub_dir: "permissions",

    src: "appfunctions.sidecar.xml",

    src: "appfunctions.extension.xml",

    filename_from_src: true,

}

libs/appfunctions/api/current.txt

+8 −8
Original line number Diff line number Diff line 
// Signature format: 2.0

package com.google.android.appfunctions.sidecar {

package com.android.extensions.appfunctions {



  public final class AppFunctionManager {

    ctor public AppFunctionManager(android.content.Context);

    method @RequiresPermission(anyOf={android.Manifest.permission.EXECUTE_APP_FUNCTIONS_TRUSTED, android.Manifest.permission.EXECUTE_APP_FUNCTIONS}, conditional=true) public void executeAppFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse>);

    method @RequiresPermission(anyOf={android.Manifest.permission.EXECUTE_APP_FUNCTIONS_TRUSTED, android.Manifest.permission.EXECUTE_APP_FUNCTIONS}, conditional=true) public void executeAppFunction(@NonNull com.android.extensions.appfunctions.ExecuteAppFunctionRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<com.android.extensions.appfunctions.ExecuteAppFunctionResponse>);

    method @RequiresPermission(anyOf={android.Manifest.permission.EXECUTE_APP_FUNCTIONS_TRUSTED, android.Manifest.permission.EXECUTE_APP_FUNCTIONS}, conditional=true) public void isAppFunctionEnabled(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);

    method public void isAppFunctionEnabled(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);

    method public void setAppFunctionEnabled(@NonNull String, int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,java.lang.Exception>);
@@ -15,7 +15,7 @@ package com.google.android.appfunctions.sidecar { 
  public abstract class AppFunctionService extends android.app.Service {

    ctor public AppFunctionService();

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

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

    method @MainThread public abstract void onExecuteFunction(@NonNull com.android.extensions.appfunctions.ExecuteAppFunctionRequest, @NonNull String, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<com.android.extensions.appfunctions.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";

  }
@@ -29,9 +29,9 @@ package com.google.android.appfunctions.sidecar { 


  public static final class ExecuteAppFunctionRequest.Builder {

    ctor public ExecuteAppFunctionRequest.Builder(@NonNull String, @NonNull String);

    method @NonNull public com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest build();

    method @NonNull public com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest.Builder setExtras(@NonNull android.os.Bundle);

    method @NonNull public com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest.Builder setParameters(@NonNull android.app.appsearch.GenericDocument);

    method @NonNull public com.android.extensions.appfunctions.ExecuteAppFunctionRequest build();

    method @NonNull public com.android.extensions.appfunctions.ExecuteAppFunctionRequest.Builder setExtras(@NonNull android.os.Bundle);

    method @NonNull public com.android.extensions.appfunctions.ExecuteAppFunctionRequest.Builder setParameters(@NonNull android.app.appsearch.GenericDocument);

  }



  public final class ExecuteAppFunctionResponse {
@@ -41,8 +41,8 @@ package com.google.android.appfunctions.sidecar { 
    method public int getResultCode();

    method @NonNull public android.app.appsearch.GenericDocument getResultDocument();

    method public boolean isSuccess();

    method @NonNull public static com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse newFailure(int, @Nullable String, @Nullable android.os.Bundle);

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

    method @NonNull public static com.android.extensions.appfunctions.ExecuteAppFunctionResponse newFailure(int, @Nullable String, @Nullable android.os.Bundle);

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

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

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

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

libs/appfunctions/appfunctions.sidecar.xml→libs/appfunctions/appfunctions.extension.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 
  -->

<permissions>

    <library

        name="com.google.android.appfunctions.sidecar"

        file="/system_ext/framework/com.google.android.appfunctions.sidecar.jar"/>

        name="com.android.extensions.appfunctions"

        file="/system_ext/framework/com.android.extensions.appfunctions.jar"/>

</permissions>
 
 No newline at end of file

libs/appfunctions/java/com/google/android/appfunctions/sidecar/AppFunctionManager.java→libs/appfunctions/java/com/android/extensions/appfunctions/AppFunctionManager.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.google.android.appfunctions.sidecar;

package com.android.extensions.appfunctions;



import android.Manifest;

import android.annotation.CallbackExecutor;

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

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.google.android.appfunctions.sidecar;

package com.android.extensions.appfunctions;



import static android.Manifest.permission.BIND_APP_FUNCTION_SERVICE;
@@ -26,7 +26,6 @@ import android.content.Intent; 
import android.os.Binder;

import android.os.CancellationSignal;

import android.os.IBinder;

import android.util.Log;



import java.util.function.Consumer;