From 8b9db55adb4dd5a6e1af5a6a5310af1b2ea9b1aa Mon Sep 17 00:00:00 2001
From: Arthur Ishiguro <arthuri@google.com>
Date: Mon, 2 Mar 2020 07:32:20 -0800
Subject: [PATCH] Hides FEATURE_CONTEXT_HUB from Android SDK

This feature guards a @SystemApi and should be hidden from the SDK.

Bug: 150326953
Test: None
Change-Id: Ifc5087fc956efd966e38934fcaacfa46f2cd7b28
---
 api/current.txt                                  | 1 -
 api/system-current.txt                           | 1 +
 core/java/android/content/pm/PackageManager.java | 3 +++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index c8a7956075579..593d11076dd40 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12081,7 +12081,6 @@ package android.content.pm {
     field public static final String FEATURE_COMPANION_DEVICE_SETUP = "android.software.companion_device_setup";
     field public static final String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";
     field public static final String FEATURE_CONSUMER_IR = "android.hardware.consumerir";
-    field public static final String FEATURE_CONTEXT_HUB = "android.hardware.context_hub";
     field public static final String FEATURE_DEVICE_ADMIN = "android.software.device_admin";
     field public static final String FEATURE_EMBEDDED = "android.hardware.type.embedded";
     field public static final String FEATURE_ETHERNET = "android.hardware.ethernet";
diff --git a/api/system-current.txt b/api/system-current.txt
index 85ad66f3dec70..bd59398cde4a8 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -2233,6 +2233,7 @@ package android.content.pm {
     field public static final String EXTRA_REQUEST_PERMISSIONS_NAMES = "android.content.pm.extra.REQUEST_PERMISSIONS_NAMES";
     field public static final String EXTRA_REQUEST_PERMISSIONS_RESULTS = "android.content.pm.extra.REQUEST_PERMISSIONS_RESULTS";
     field public static final String FEATURE_BROADCAST_RADIO = "android.hardware.broadcastradio";
+    field public static final String FEATURE_CONTEXT_HUB = "android.hardware.context_hub";
     field public static final String FEATURE_INCREMENTAL_DELIVERY = "android.software.incremental_delivery";
     field public static final String FEATURE_REBOOT_ESCROW = "android.hardware.reboot_escrow";
     field public static final String FEATURE_TELEPHONY_CARRIERLOCK = "android.hardware.telephony.carrierlock";
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index f2ec938b3d9d4..5474b7e248895 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -1995,7 +1995,10 @@ public abstract class PackageManager {
      * Feature for {@link #getSystemAvailableFeatures} and
      * {@link #hasSystemFeature}: The device supports a Context Hub, used to expose the
      * functionalities in {@link android.hardware.location.ContextHubManager}.
+     *
+     * @hide
      */
+    @SystemApi
     @SdkConstant(SdkConstantType.FEATURE)
     public static final String FEATURE_CONTEXT_HUB = "android.hardware.context_hub";