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

Commit 62018429 authored by Dan Morrill's avatar Dan Morrill Committed by Android (Google) Code Review
Browse files

Merge "Adding new feature definitions for new sensors (barometer and gyroscope.)" into gingerbread

parents a6dc4699 5744bb4a

api/current.xml

+22 −0
Original line number Original line Diff line number Diff line
@@ -49042,6 +49042,17 @@ 
 visibility="public"

 visibility="public"

>

>

</field>

</field>

<field name="FEATURE_SENSOR_BAROMETER"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.sensor.barometer&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_SENSOR_COMPASS"

<field name="FEATURE_SENSOR_COMPASS"

 type="java.lang.String"

 type="java.lang.String"

 transient="false"

 transient="false"
@@ -49053,6 +49064,17 @@ 
 visibility="public"

 visibility="public"

>

>

</field>

</field>

<field name="FEATURE_SENSOR_GYROSCOPE"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.sensor.gyroscope&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_SENSOR_LIGHT"

<field name="FEATURE_SENSOR_LIGHT"

 type="java.lang.String"

 type="java.lang.String"

 transient="false"

 transient="false"

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

+17 −2
Original line number Original line Diff line number Diff line
@@ -711,6 +711,21 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_NFC = "android.hardware.nfc";

    public static final String FEATURE_NFC = "android.hardware.nfc";





    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device includes an accelerometer.

     */

    @SdkConstant(SdkConstantType.FEATURE)

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



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device includes a barometer (air

     * pressure sensor.)

     */

    @SdkConstant(SdkConstantType.FEATURE)

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



    /**

    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device includes a magnetometer (compass).

     * {@link #hasSystemFeature}: The device includes a magnetometer (compass).
@@ -720,10 +735,10 @@ public abstract class PackageManager { 




    /**

    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device includes an accelerometer.

     * {@link #hasSystemFeature}: The device includes a gyroscope.

     */

     */

    @SdkConstant(SdkConstantType.FEATURE)

    @SdkConstant(SdkConstantType.FEATURE)

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

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





    /**

    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * Feature for {@link #getSystemAvailableFeatures} and

data/etc/android.hardware.sensor.barometer.xml

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2010 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

  

          http://www.apache.org/licenses/LICENSE-2.0

  

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- Feature for devices with barometer. -->

<permissions>

    <feature name="android.hardware.sensor.barometer" />

</permissions>

data/etc/android.hardware.sensor.gyroscope.xml

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2010 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at

  

          http://www.apache.org/licenses/LICENSE-2.0

  

     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- Feature for devices with gyroscope. -->

<permissions>

    <feature name="android.hardware.sensor.gyroscope" />

</permissions>