Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49e96a8a authored by Arthur Ishiguro's avatar Arthur Ishiguro
Browse files

Fixes Context Hub feature naming and documentation 

- Adds "_" in variable name for consistency with feature string
- Adds documentation on what the feature is used for

Bug: 149475852
Test: None
Change-Id: I6eca279df8409de1155cd7014647a705d0d31d6f
parent 339405fc

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -12068,7 +12068,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";

core/java/android/content/pm/PackageManager.java

+3 −2
Original line number Diff line number Diff line
@@ -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)

core/java/android/hardware/location/ContextHubManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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";

services/java/com/android/server/SystemServer.java

+1 −1
Original line number Diff line number Diff line
@@ -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();