From 5ed89a0f981d63dec2134e5b96fba757cfa55743 Mon Sep 17 00:00:00 2001 From: Tony Mak Date: Mon, 16 Sep 2024 10:10:35 +0100 Subject: Fix two issues I found when adding CTS 1. staticMetadata qualified ID is not set proprely. 2. The schema visibility should be set in the child schema, instead of parent. Flag: android.app.appfunctions.flags.enable_app_function_manager Bug: 360864791 Test: atest FrameworksAppFunctionsTests Change-Id: Ic94d6d5acf3a3ee7fede10b61f2dbe82813b468d --- .../android/server/appfunctions/MetadataSyncAdapter.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'services/appfunctions/java') diff --git a/services/appfunctions/java/com/android/server/appfunctions/MetadataSyncAdapter.java b/services/appfunctions/java/com/android/server/appfunctions/MetadataSyncAdapter.java index d140258107dc..e2573590bf5d 100644 --- a/services/appfunctions/java/com/android/server/appfunctions/MetadataSyncAdapter.java +++ b/services/appfunctions/java/com/android/server/appfunctions/MetadataSyncAdapter.java @@ -180,11 +180,7 @@ public class MetadataSyncAdapter { ArraySet addedFunctionIds = addedFunctionsDiffMap.valueAt(i); for (String addedFunctionId : addedFunctionIds) { putDocumentRequestBuilder.addGenericDocuments( - new AppFunctionRuntimeMetadata.Builder( - packageName, - addedFunctionId, - AppFunctionRuntimeMetadata - .PROPERTY_APP_FUNCTION_STATIC_METADATA_QUALIFIED_ID) + new AppFunctionRuntimeMetadata.Builder(packageName, addedFunctionId) .build()); } } @@ -232,12 +228,11 @@ public class MetadataSyncAdapter { runtimeMetadataSchema.getSchemaType(), true, new PackageIdentifier(packageName, packageCert)); + setSchemaRequestBuilder.addRequiredPermissionsForSchemaTypeVisibility( + runtimeMetadataSchema.getSchemaType(), Set.of(EXECUTE_APP_FUNCTIONS)); + setSchemaRequestBuilder.addRequiredPermissionsForSchemaTypeVisibility( + runtimeMetadataSchema.getSchemaType(), Set.of(EXECUTE_APP_FUNCTIONS_TRUSTED)); } - - setSchemaRequestBuilder.addRequiredPermissionsForSchemaTypeVisibility( - RUNTIME_SCHEMA_TYPE, Set.of(EXECUTE_APP_FUNCTIONS)); - setSchemaRequestBuilder.addRequiredPermissionsForSchemaTypeVisibility( - RUNTIME_SCHEMA_TYPE, Set.of(EXECUTE_APP_FUNCTIONS_TRUSTED)); return setSchemaRequestBuilder.build(); } -- cgit v1.2.3-59-g8ed1b