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

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

Merge "Adding a feature definition corresponding to support for Near-Field... 

Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
parents 05f0382b 76437d37

api/current.xml

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

 visibility="public"

>

>

</field>

</field>

<field name="FEATURE_NFC"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;android.hardware.nfc&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FEATURE_SENSOR_ACCELEROMETER"

<field name="FEATURE_SENSOR_ACCELEROMETER"

 type="java.lang.String"

 type="java.lang.String"

 transient="false"

 transient="false"

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -703,6 +703,14 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_MICROPHONE = "android.hardware.microphone";

    public static final String FEATURE_MICROPHONE = "android.hardware.microphone";





    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device can communicate using Near-Field

     * Communications (NFC).

     */

    @SdkConstant(SdkConstantType.FEATURE)

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



    /**

    /**

     * 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).

data/etc/android.hardware.nfc.xml

0 → 100644
+21 −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.

-->



<!-- This is the standard feature indicating that the device can communicate

     using Near-Field Communications (NFC). -->

<permissions>

    <feature name="android.hardware.nfc" />

</permissions>