From f74130f525ae29fe197dab424bfdae5581755fde Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Wed, 19 Feb 2020 18:29:12 +0000 Subject: [PATCH] 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 --- services/Android.bp | 3 ++- services/api/lint-baseline.txt | 16 ---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/services/Android.bp b/services/Android.bp index c77e75da66ba8..db6e21a62ff37 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -114,9 +114,10 @@ droidstubs { name: "services-stubs.sources", srcs: [":services-all-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" + diff --git a/services/api/lint-baseline.txt b/services/api/lint-baseline.txt index 0b8658cf469d3..b42a258725450 100644 --- a/services/api/lint-baseline.txt +++ b/services/api/lint-baseline.txt @@ -1,20 +1,4 @@ // Baseline format: 1.0 -InternalClasses: com.android.permission.persistence.RuntimePermissionsPersistence: - Internal classes must not be exposed -InternalClasses: com.android.permission.persistence.RuntimePermissionsState: - Internal classes must not be exposed -InternalClasses: com.android.permission.persistence.RuntimePermissionsState.PermissionState: - Internal classes must not be exposed -InternalClasses: com.android.role.persistence.RolesPersistence: - Internal classes must not be exposed -InternalClasses: com.android.role.persistence.RolesState: - Internal classes must not be exposed -InternalClasses: com.android.server.SystemService: - Internal classes must not be exposed -InternalClasses: com.android.server.SystemService.TargetUser: - Internal classes must not be exposed - - ProtectedMember: com.android.server.SystemService#publishBinderService(String, android.os.IBinder): Protected methods not allowed; must be public: method com.android.server.SystemService.publishBinderService(String,android.os.IBinder)} ProtectedMember: com.android.server.SystemService#publishBinderService(String, android.os.IBinder, boolean):