Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes Context Hub feature naming and documentation"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-14 04:34:23 +00:00
committed by Android (Google) Code Review
parent d813cd6e39 49e96a8ab7
commit a4d20a71b3
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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";

5
core/java/android/content/pm/PackageManager.java
View File

@@ -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)

2
core/java/android/hardware/location/ContextHubManager.java
View File

@@ -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";

2
services/java/com/android/server/SystemServer.java
View File

@@ -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();