diff options
| author | Dan Morrill <morrildl@google.com> | 2010-09-01 15:05:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 15:05:34 -0700 |
| commit | 61f1cbdd71942433ce1515b614ec3d9c259ea037 (patch) | |
| tree | 9152ec01a4c86d5d28d54709d8875982faa50957 | |
| parent | b4de2f997591d3ee5f1eff92fbf2d4628cee5f2c (diff) | |
| parent | a800a2efa29d88e198220753f07e7d9ff69ddd9b (diff) | |
| download | frameworks_base-61f1cbdd71942433ce1515b614ec3d9c259ea037.zip frameworks_base-61f1cbdd71942433ce1515b614ec3d9c259ea037.tar.gz frameworks_base-61f1cbdd71942433ce1515b614ec3d9c259ea037.tar.bz2 | |
am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp
* commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b':
Adding a feature definition corresponding to support for Near-Field
| -rw-r--r-- | api/current.xml | 11 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 8 | ||||
| -rw-r--r-- | data/etc/android.hardware.nfc.xml | 21 |
3 files changed, 40 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index 4f4986f..335d565 100644 --- a/api/current.xml +++ b/api/current.xml @@ -49076,6 +49076,17 @@ visibility="public" > </field> +<field name="FEATURE_NFC" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.hardware.nfc"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="FEATURE_SENSOR_ACCELEROMETER" type="java.lang.String" transient="false" diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 7f166cf..52010a8 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -705,6 +705,14 @@ public abstract class PackageManager { /** * 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 * {@link #hasSystemFeature}: The device includes a magnetometer (compass). */ @SdkConstant(SdkConstantType.FEATURE) diff --git a/data/etc/android.hardware.nfc.xml b/data/etc/android.hardware.nfc.xml new file mode 100644 index 0000000..81c4a84 --- /dev/null +++ b/data/etc/android.hardware.nfc.xml @@ -0,0 +1,21 @@ +<?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> |