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

Commit 8b674abf authored by Aravind Akella's avatar Aravind Akella Committed by Android (Google) Code Review
Browse files

Merge "Add PackageManager feature strings for relative humidity and... 

Merge "Add PackageManager feature strings for relative humidity and temperature sensors." into lmp-dev
parents 77ec2cea 8b8e74bd

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -8597,12 +8597,14 @@ package android.content.pm { 
    field public static final java.lang.String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";

    field public static final java.lang.String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait";

    field public static final java.lang.String FEATURE_SENSOR_ACCELEROMETER = "android.hardware.sensor.accelerometer";

    field public static final java.lang.String FEATURE_SENSOR_AMBIENT_TEMPERATURE = "android.hardware.sensor.ambient_temperature";

    field public static final java.lang.String FEATURE_SENSOR_BAROMETER = "android.hardware.sensor.barometer";

    field public static final java.lang.String FEATURE_SENSOR_COMPASS = "android.hardware.sensor.compass";

    field public static final java.lang.String FEATURE_SENSOR_GYROSCOPE = "android.hardware.sensor.gyroscope";

    field public static final java.lang.String FEATURE_SENSOR_HEART_RATE = "android.hardware.sensor.heartrate";

    field public static final java.lang.String FEATURE_SENSOR_LIGHT = "android.hardware.sensor.light";

    field public static final java.lang.String FEATURE_SENSOR_PROXIMITY = "android.hardware.sensor.proximity";

    field public static final java.lang.String FEATURE_SENSOR_RELATIVE_HUMIDITY = "android.hardware.sensor.relative_humidity";

    field public static final java.lang.String FEATURE_SENSOR_STEP_COUNTER = "android.hardware.sensor.stepcounter";

    field public static final java.lang.String FEATURE_SENSOR_STEP_DETECTOR = "android.hardware.sensor.stepdetector";

    field public static final java.lang.String FEATURE_SIP = "android.software.sip";

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

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

    public static final String FEATURE_SENSOR_HEART_RATE = "android.hardware.sensor.heartrate";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device includes a relative humidity sensor.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_SENSOR_RELATIVE_HUMIDITY =

            "android.hardware.sensor.relative_humidity";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device includes an ambient temperature sensor.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_SENSOR_AMBIENT_TEMPERATURE =

            "android.hardware.sensor.ambient_temperature";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device has a telephony radio with data