commit 3160c60a210698011199b8a957c83cf9c04f5124
author Jiyong Park <jiyong@google.com> Wed Jan 08 10:08:03 2020 +0900
committer Jiyong Park <jiyong@google.com> Wed Jan 08 10:13:48 2020 +0900
tree b28f3822a08a7c8477a55573d40926e3669a6f06
parent a6a681768c93bdd3a29140575c3f48920004c234

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

diff --git a/services/Android.bp b/services/Android.bp
index 80452f1..943e491 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -111,7 +111,7 @@
     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" +