Merge "Add services-stubs for in-process APIs in services.jar" am: 99d091ee81 am: 1c86d14d8f (d51df31c) · Commits · e / os / android_frameworks_base

services/Android.bp

+26 −0

Original line number	Diff line number	Diff line
		@@ -102,3 +102,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,
		}

0 → 100644

+17 −0

Original line number	Diff line number	Diff line
		/*
		* 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;

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;