Merge "API: Enable UnhiddenSystemApi check for frameworks/base" am: 94becc7b4f am: 520253e06c
am: b24fe88a37

Change-Id: I39be987fc688e6e4d721a8ab289cc986bdbcdaef
diff --git a/Android.bp b/Android.bp
index e096c9d..5a1b813 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1190,6 +1190,7 @@
 metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.xml) " +
     "--hide-package com.android.okhttp " +
     "--hide-package com.android.org.conscrypt --hide-package com.android.server " +
+    "--error UnhiddenSystemApi " +
     "--hide RequiresPermission " +
     "--hide MissingPermission --hide BroadcastBehavior " +
     "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " +
@@ -1606,6 +1607,7 @@
     dex_mapping_filename: "dex-mapping.txt",
     args: metalava_framework_docs_args +
         " --hide ReferencesHidden " +
+        " --hide UnhiddenSystemApi " +
         " --show-unannotated " +
         " --show-annotation android.annotation.SystemApi " +
         " --show-annotation android.annotation.TestApi "