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

Commit 0e1b6b01 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Controls API - Flag controls support" into rvc-dev am: 897187dc am: 166c228a 

Change-Id: I2dd06efec24d2ea0010ee152877beb9b10cac493
parents 2dba57d9 166c228a

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12097,6 +12097,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_CONTROLS = "android.software.controls";

    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

+10 −0
Original line number Diff line number Diff line
@@ -3048,6 +3048,16 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_IPSEC_TUNNELS = "android.software.ipsec_tunnels";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports a system interface for the user to select

     * and bind device control services provided by applications.

     *

     * @see android.service.controls.ControlsProviderService

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_CONTROLS = "android.software.controls";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device has

     * the requisite hardware support to support reboot escrow of synthetic password for updates.