diff options
| author | 2020-02-14 04:34:23 +0000 | |
|---|---|---|
| committer | 2020-02-14 04:34:23 +0000 | |
| commit | a4d20a71b33d04723f99bed66d307a236cd861d8 (patch) | |
| tree | da488ca4a389576c7d176a99aff56095eaa47a3a | |
| parent | d813cd6e394161ce502f75c24114b82be6896fc8 (diff) | |
| parent | 49e96a8ab78bddc694f90aa394e61bc311753150 (diff) | |
Merge "Fixes Context Hub feature naming and documentation"
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 5 | ||||
| -rw-r--r-- | core/java/android/hardware/location/ContextHubManager.java | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index 0290586dc1b8..9f64c6a4497c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12071,7 +12071,7 @@ 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_CONTEXTHUB = "android.hardware.context_hub"; + 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/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index ae147488e4d5..7b484b7c2c3d 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1988,10 +1988,11 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and - * {@link #hasSystemFeature}: The device supports a Context Hub. + * {@link #hasSystemFeature}: The device supports a Context Hub, used to expose the + * functionalities in {@link android.hardware.location.ContextHubManager}. */ @SdkConstant(SdkConstantType.FEATURE) - public static final String FEATURE_CONTEXTHUB = "android.hardware.context_hub"; + public static final String FEATURE_CONTEXT_HUB = "android.hardware.context_hub"; /** {@hide} */ @SdkConstant(SdkConstantType.FEATURE) diff --git a/core/java/android/hardware/location/ContextHubManager.java b/core/java/android/hardware/location/ContextHubManager.java index db16d24e0af1..1ed791d66f74 100644 --- a/core/java/android/hardware/location/ContextHubManager.java +++ b/core/java/android/hardware/location/ContextHubManager.java @@ -54,7 +54,7 @@ import java.util.concurrent.Executor; */ @SystemApi @SystemService(Context.CONTEXTHUB_SERVICE) -@RequiresFeature(PackageManager.FEATURE_CONTEXTHUB) +@RequiresFeature(PackageManager.FEATURE_CONTEXT_HUB) public final class ContextHubManager { private static final String TAG = "ContextHubManager"; diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 93662c91af90..1936f13ca6e1 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1741,7 +1741,7 @@ public final class SystemServer { mSystemServiceManager.startService(SensorNotificationService.class); t.traceEnd(); - if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_CONTEXTHUB)) { + if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_CONTEXT_HUB)) { t.traceBegin("StartContextHubSystemService"); mSystemServiceManager.startService(ContextHubSystemService.class); t.traceEnd(); |