Revert "Use framework-appsearch-stubs instead of framework-appsearch"

This reverts commit 476008fb75989b0f8d462a776155738f63dc0d96.

Reason for revert: There are ~20 pending CLs in this project in various
stages of review, and this CL causes widespread breakages in many parts
of our work (including CTS tests, coretests and servicetests) and blocks
multiple team members. Given the closeness of the API review deadline
and the fact that framework-appsearch is empty at HEAD (so building at
head is not indicative that the infrastructure supports the project's
needs), would it be possible to hold off on building against the stubs
or now until the various tests are set up at HEAD? ETA for getting code
submitted in this project: 1 day.

Change-Id: Ie2ea82f5ee41861e93f5bdf34ceae1417328d26a

Android.bp

@@ -487,7 +487,7 @@ java_library {
         "framework-minus-apex",
         "updatable_media_stubs",
         "framework_mediaprovider_stubs",
-        "framework-appsearch-stubs",
+        "framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs
         "framework-sdkextensions-stubs-systemapi",
         // TODO(b/146167933): Use framework-statsd-stubs instead.
         "framework-statsd",

apex/appsearch/framework/Android.bp

@@ -30,10 +30,29 @@ java_library {
   libs: [
     "framework-minus-apex",  // TODO(b/146218515) should be framework-system-stubs
   ],
-  visibility: ["//frameworks/base/apex/appsearch:__subpackages__"],
+  visibility: [
+      "//frameworks/base/apex/appsearch:__subpackages__",
+      // TODO(b/146218515) remove this when framework is built with the stub of appsearch
+      "//frameworks/base",
+  ],
   apex_available: ["com.android.appsearch"],
 }
 
+metalava_appsearch_docs_args =
+    "--hide-package com.android.server " +
+    "--error UnhiddenSystemApi " +
+    "--hide RequiresPermission " +
+    "--hide MissingPermission " +
+    "--hide BroadcastBehavior " +
+    "--hide HiddenSuperclass " +
+    "--hide DeprecationMismatch " +
+    "--hide UnavailableSymbol " +
+    "--hide SdkConstant " +
+    "--hide HiddenTypeParameter " +
+    "--hide Todo --hide Typo " +
+    "--hide HiddenTypedefConstant " +
+    "--show-annotation android.annotation.SystemApi "
+
 droidstubs {
     name: "framework-appsearch-stubs-srcs",
     srcs: [
@@ -43,8 +62,9 @@ droidstubs {
     aidl: {
         include_dirs: ["frameworks/base/core/java"],
     },
-    defaults: ["framework-module-stubs-defaults-systemapi"],
-    sdk_version: "system_current",
+    args: metalava_appsearch_docs_args,
+    sdk_version: "core_current",
+    libs: ["android_system_stubs_current"],
 }
 
 java_library {
@@ -55,6 +75,7 @@ java_library {
             "java",
         ],
     },
-    sdk_version: "system_current",
+    sdk_version: "core_current",
+    libs: ["android_system_stubs_current"],
     installable: false,
 }

apex/appsearch/service/Android.bp

@@ -20,7 +20,6 @@ java_library {
   libs: [
     "framework",
     "services.core",
-    "framework-appsearch",
   ],
   static_libs: [
     "icing-java-proto-lite",