summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jiyong Park <jiyong@google.com> 2019-11-17 15:17:53 +0900
committer Jiyong Park <jiyong@google.com> 2019-12-17 14:20:15 +0900
commit759a269a65762e89e6ad3d0cb90cc9d2e10ed565 (patch)
tree77e1952a6a99a35f526a67c225968c78bc222901
parent36af0dc32e8d6d66eae27f74a9a127e97c18ae86 (diff)
Add services-stubs for in-process APIs in services.jar
services-stubs is a stubs library for services.jar. It provides the in-process APIs that's available inside the system server process running services.jar. Currently, all APIs in the jar are hidden by annotating com.android.server package with @android.annotation.Hide. To add some APIs, 1) remove package-info.java for com.android.server 2) add package-info.java for other sub packages 3) annotate them with @android.annotation.Hide except for the package where the newly added APIs are in This change also added android.annotation.Hide class which can be used to hide an API without using the @hide javadoc tag. This opens up the possibility of running metalava over the compiled jar, which is expected to be much faster than when ran with source files. Bug: 139391334 Test: m Test: m services-stubs Exempt-From-Owner-Approval: cherry-pick from internal Merged-In: I027b8a22b3e7533f6203aabb9dc3f690e4e842a6 (cherry picked from commit abc72e45c647d6f617ce90b7a5d4a3121c0aa87d) Change-Id: I027b8a22b3e7533f6203aabb9dc3f690e4e842a6
-rw-r--r--services/Android.bp26
-rw-r--r--services/core/java/com/android/server/package-info.java17
-rw-r--r--services/net/java/android/net/NetworkMonitorManager.java2
-rw-r--r--services/net/java/android/net/ip/IpClientManager.java2
4 files changed, 47 insertions, 0 deletions
diff --git a/services/Android.bp b/services/Android.bp
index 3b566078bd51..5290ebb85f3a 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -101,3 +101,29 @@ filegroup {
name: "art-profile",
srcs: ["art-profile"],
}
+
+// API stub
+// =============================================================
+
+droidstubs {
+ name: "services-stubs.sources",
+ srcs: [":services-sources"],
+ installable: false,
+ // TODO: remove the --hide options below
+ args: " --show-single-annotation android.annotation.SystemApi" +
+ " --hide-annotation android.annotation.Hide" +
+ " --hide-package com.google.android.startop.iorap" +
+ " --hide ReferencesHidden" +
+ " --hide DeprecationMismatch" +
+ " --hide HiddenTypedefConstant",
+ libs: [
+ "framework-all",
+ ],
+ visibility: ["//visibility:private"],
+}
+
+java_library {
+ name: "services-stubs",
+ srcs: [":services-stubs.sources"],
+ installable: false,
+}
diff --git a/services/core/java/com/android/server/package-info.java b/services/core/java/com/android/server/package-info.java
new file mode 100644
index 000000000000..a783e8d61a32
--- /dev/null
+++ b/services/core/java/com/android/server/package-info.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@android.annotation.Hide
+package com.android.server;
diff --git a/services/net/java/android/net/NetworkMonitorManager.java b/services/net/java/android/net/NetworkMonitorManager.java
index 0f41302c0b15..0f669817f52e 100644
--- a/services/net/java/android/net/NetworkMonitorManager.java
+++ b/services/net/java/android/net/NetworkMonitorManager.java
@@ -16,6 +16,7 @@
package android.net;
+import android.annotation.Hide;
import android.annotation.NonNull;
import android.os.Binder;
import android.os.RemoteException;
@@ -33,6 +34,7 @@ import android.util.Log;
* wrapper methods in this class return a boolean that callers can use to determine whether
* RemoteException was thrown.
*/
+@Hide
public class NetworkMonitorManager {
@NonNull private final INetworkMonitor mNetworkMonitor;
diff --git a/services/net/java/android/net/ip/IpClientManager.java b/services/net/java/android/net/ip/IpClientManager.java
index 4b7ed3c7b72f..09e333ee3471 100644
--- a/services/net/java/android/net/ip/IpClientManager.java
+++ b/services/net/java/android/net/ip/IpClientManager.java
@@ -16,6 +16,7 @@
package android.net.ip;
+import android.annotation.Hide;
import android.annotation.NonNull;
import android.net.NattKeepalivePacketData;
import android.net.ProxyInfo;
@@ -38,6 +39,7 @@ import android.util.Log;
* wrapper methods in this class return a boolean that callers can use to determine whether
* RemoteException was thrown.
*/
+@Hide
public class IpClientManager {
@NonNull private final IIpClient mIpClient;
@NonNull private final String mTag;