From 3160c60a210698011199b8a957c83cf9c04f5124 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Wed, 8 Jan 2020 10:08:03 +0900 Subject: [PATCH] Annotating a class with @SystemApi makes its members @SystemApi This change fixes a bug that annotating a class in services.jar as @SystemApi doesn't automatically make its member fields and methods as @SystemApi. The problem was due to a wrong option to the metalava. Bug: 147322525 Test: cherry-pick ag/10037363 and `m update-api`. services/api/current.txt contains all the symbols from the SystemService class. Change-Id: I30a515761f8d1792593f207fa4e268ab68a81480 --- services/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/Android.bp b/services/Android.bp index 80452f19e6c1b..943e491393dd3 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -111,7 +111,7 @@ droidstubs { srcs: [":services-sources"], installable: false, // TODO: remove the --hide options below - args: " --show-single-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES,process=android.annotation.SystemApi.Process.SYSTEM_SERVER\\)" + + args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.MODULE_LIBRARIES,process=android.annotation.SystemApi.Process.SYSTEM_SERVER\\)" + " --hide-annotation android.annotation.Hide" + " --hide-package com.google.android.startop.iorap" + " --hide ReferencesHidden" +