commit ac119a33c2251aecd08d548cdae382862847fd3c
author Anton Hansson <hansson@google.com> Wed Feb 19 18:29:12 2020 +0000
committer Anton Hansson <hansson@google.com> Thu Feb 20 11:40:34 2020 +0000
tree e2a14671c2bec43f54e2c0b8529891968bc76e7e
parent b14743ce82d1ab5a5ace9f9e5fb38311d9163a9d

Allow com.android.* classes in system_service stubs

The android.* rule is meant to be for the public SDK.

Bug: 147559833
Test: m checkapi
Change-Id: I8b36cf7a4ff569d0b960455de09ed40592dd5a9e
Merged-In: I8b36cf7a4ff569d0b960455de09ed40592dd5a9e
(cherry picked from commit f74130f525ae29fe197dab424bfdae5581755fde)

services/Android.bp

diff --git a/services/Android.bp b/services/Android.bp
index cecadfd..bca34f5 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -110,9 +110,10 @@
     name: "services-stubs.sources",
     srcs: [":services-sources"],
     installable: false,
-    // TODO: remove the --hide options below
     args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)" +
         " --hide-annotation android.annotation.Hide" +
+        " --hide InternalClasses" + // com.android.* classes are okay in this interface
+        // TODO: remove the --hide options below
         " --hide-package com.google.android.startop.iorap" +
         " --hide ReferencesHidden" +
         " --hide DeprecationMismatch" +