Merge "Fix two issues I found when adding CTS" into main (e6a46578) · Commits · e / os / android_frameworks_base

core/java/android/app/appfunctions/AppFunctionRuntimeMetadata.java

+4 −7

Original line number	Diff line number	Diff line
		@@ -180,13 +180,8 @@ public class AppFunctionRuntimeMetadata extends GenericDocument {
		*
		* @param packageName the name of the package that owns the function.
		* @param functionId the id of the function.
		* @param staticMetadataQualifiedId the qualified static metadata id that this runtime
		* metadata refers to.
		*/
		public Builder(
		@NonNull String packageName,
		@NonNull String functionId,
		@NonNull String staticMetadataQualifiedId) {
		public Builder(@NonNull String packageName, @NonNull String functionId) {
		super(
		APP_FUNCTION_RUNTIME_NAMESPACE,
		getDocumentIdForAppFunction(
		@@ -198,7 +193,9 @@ public class AppFunctionRuntimeMetadata extends GenericDocument {

		// Set qualified id automatically
		setPropertyString(
		PROPERTY_APP_FUNCTION_STATIC_METADATA_QUALIFIED_ID, staticMetadataQualifiedId);
		PROPERTY_APP_FUNCTION_STATIC_METADATA_QUALIFIED_ID,
		AppFunctionStaticMetadataHelper.getStaticMetadataQualifiedId(
		packageName, functionId));
		}

		/**

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

+5 −10

Original line number	Diff line number	Diff line
		@@ -180,11 +180,7 @@ public class MetadataSyncAdapter {
		ArraySet<String> 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(
		RUNTIME_SCHEMA_TYPE, Set.of(EXECUTE_APP_FUNCTIONS));
		runtimeMetadataSchema.getSchemaType(), Set.of(EXECUTE_APP_FUNCTIONS));
		setSchemaRequestBuilder.addRequiredPermissionsForSchemaTypeVisibility(
		RUNTIME_SCHEMA_TYPE, Set.of(EXECUTE_APP_FUNCTIONS_TRUSTED));
		runtimeMetadataSchema.getSchemaType(), Set.of(EXECUTE_APP_FUNCTIONS_TRUSTED));
		}
		return setSchemaRequestBuilder.build();
		}

services/tests/appfunctions/src/android/app/appfunctions/AppFunctionRuntimeMetadataTest.kt

+11 −0

Original line number	Diff line number	Diff line
		@@ -101,4 +101,15 @@ class AppFunctionRuntimeMetadataTest {

		assertThat(actualPackageName).isEqualTo(expectedPackageName)
		}

		@Test
		fun testBuild() {
		val runtimeMetadata = AppFunctionRuntimeMetadata.Builder("com.pkg", "funcId").build()

		assertThat(runtimeMetadata.packageName).isEqualTo("com.pkg")
		assertThat(runtimeMetadata.functionId).isEqualTo("funcId")
		assertThat(runtimeMetadata.enabled).isNull()
		assertThat(runtimeMetadata.appFunctionStaticMetadataQualifiedId)
		.isEqualTo("android\$apps-db/app_functions#com.pkg/funcId")
		}
		}

services/tests/appfunctions/src/com/android/server/appfunctions/FutureAppSearchSessionTest.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -84,7 +84,7 @@ class FutureAppSearchSessionTest {
		val schema = session.setSchema(setSchemaRequest)
		assertThat(schema.get()).isNotNull()
		val appFunctionRuntimeMetadata =
		AppFunctionRuntimeMetadata.Builder(TEST_PACKAGE_NAME, TEST_FUNCTION_ID, "").build()
		AppFunctionRuntimeMetadata.Builder(TEST_PACKAGE_NAME, TEST_FUNCTION_ID).build()
		val putDocumentsRequest: PutDocumentsRequest =
		PutDocumentsRequest.Builder()
		.addGenericDocuments(appFunctionRuntimeMetadata)
		@@ -110,7 +110,7 @@ class FutureAppSearchSessionTest {
		val schema = session.setSchema(setSchemaRequest)
		assertThat(schema.get()).isNotNull()
		val appFunctionRuntimeMetadata =
		AppFunctionRuntimeMetadata.Builder(TEST_PACKAGE_NAME, TEST_FUNCTION_ID, "").build()
		AppFunctionRuntimeMetadata.Builder(TEST_PACKAGE_NAME, TEST_FUNCTION_ID).build()
		val putDocumentsRequest: PutDocumentsRequest =
		PutDocumentsRequest.Builder()
		.addGenericDocuments(appFunctionRuntimeMetadata)
		@@ -144,7 +144,7 @@ class FutureAppSearchSessionTest {
		val schema = session.setSchema(setSchemaRequest)
		assertThat(schema.get()).isNotNull()
		val appFunctionRuntimeMetadata =
		AppFunctionRuntimeMetadata.Builder(TEST_PACKAGE_NAME, TEST_FUNCTION_ID, "").build()
		AppFunctionRuntimeMetadata.Builder(TEST_PACKAGE_NAME, TEST_FUNCTION_ID).build()
		val putDocumentsRequest: PutDocumentsRequest =
		PutDocumentsRequest.Builder()
		.addGenericDocuments(appFunctionRuntimeMetadata)
		@@ -175,7 +175,7 @@ class FutureAppSearchSessionTest {
		.build()
		session.setSchema(setSchemaRequest).get()
		val appFunctionRuntimeMetadata =
		AppFunctionRuntimeMetadata.Builder(TEST_PACKAGE_NAME, TEST_FUNCTION_ID, "").build()
		AppFunctionRuntimeMetadata.Builder(TEST_PACKAGE_NAME, TEST_FUNCTION_ID).build()
		val putDocumentsRequest: PutDocumentsRequest =
		PutDocumentsRequest.Builder()
		.addGenericDocuments(appFunctionRuntimeMetadata)

services/tests/appfunctions/src/com/android/server/appfunctions/FutureGlobalSearchSessionTest.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -94,8 +94,7 @@ class FutureGlobalSearchSessionTest {
		val schema = session.setSchema(setSchemaRequest)
		assertThat(schema.get()).isNotNull()
		val appFunctionRuntimeMetadata =
		AppFunctionRuntimeMetadata.Builder(TEST_TARGET_PKG_NAME, TEST_FUNCTION_ID, "")
		.build()
		AppFunctionRuntimeMetadata.Builder(TEST_TARGET_PKG_NAME, TEST_FUNCTION_ID).build()
		val putDocumentsRequest: PutDocumentsRequest =
		PutDocumentsRequest.Builder()
		.addGenericDocuments(appFunctionRuntimeMetadata)