summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-07-10 15:26:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-07-10 15:26:40 +0000
commit143eb1ff95f8019d36b95d39824c853a3a57a18f (patch)
tree1b395832e07bada7c4315ba4898d694b86d42f27
parent33f7cab3999d6e2efffb73aab24332ccd1fdffc9 (diff)
parent30028ce0463cb10028deec7bcaf53d7e550d4073 (diff)
Merge "Replace hidden_api_packages with package-info.java and @hide" into main am: 30028ce046
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3164498 Change-Id: I46f7aa94fe53d558c47d40896171f488a3527537 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--location/Android.bp3
-rw-r--r--location/java/com/android/internal/location/package-info.java22
-rw-r--r--nfc/Android.bp3
3 files changed, 22 insertions, 6 deletions
diff --git a/location/Android.bp b/location/Android.bp
index 7f3442c47d1f..10ca97d74660 100644
--- a/location/Android.bp
+++ b/location/Android.bp
@@ -30,9 +30,6 @@ java_sdk_library {
"app-compat-annotations",
"unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
],
- hidden_api_packages: [
- "com.android.internal.location",
- ],
aidl: {
include_dirs: [
"frameworks/base/location/java",
diff --git a/location/java/com/android/internal/location/package-info.java b/location/java/com/android/internal/location/package-info.java
new file mode 100644
index 000000000000..25573c15ce59
--- /dev/null
+++ b/location/java/com/android/internal/location/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+
+/**
+ * Exclude from API surfaces
+ *
+ * @hide
+ */
+package com.android.internal.location;
diff --git a/nfc/Android.bp b/nfc/Android.bp
index 13ac2311bde3..0282e6f5c246 100644
--- a/nfc/Android.bp
+++ b/nfc/Android.bp
@@ -61,9 +61,6 @@ java_sdk_library {
"android.nfc",
"com.android.nfc",
],
- hidden_api_packages: [
- "com.android.nfc",
- ],
impl_library_visibility: [
"//frameworks/base:__subpackages__",
"//cts/hostsidetests/multidevices/nfc:__subpackages__",