diff options
| author | Nick Pelly <npelly@google.com> | 2010-12-07 22:40:28 -0800 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-12-10 17:12:33 -0800 |
| commit | 50b4d8f643f31b37e9872f562fb869059cf79c8a (patch) | |
| tree | 6f866534d961355448a91f04ee5b3bec2b3b7dd5 /api | |
| parent | a218e01437c3c47c49ced7ab363bf98fe92cf1e3 (diff) | |
| download | frameworks_base-50b4d8f643f31b37e9872f562fb869059cf79c8a.zip frameworks_base-50b4d8f643f31b37e9872f562fb869059cf79c8a.tar.gz frameworks_base-50b4d8f643f31b37e9872f562fb869059cf79c8a.tar.bz2 | |
Make getSystemService(NFC_SERVICE) the NFC entry point.
This gives NFC service a handle to the application context.
Deprecate NfcAdapter.getDefaultAdapter(), it does not provide a context.
Using this method will print a warning, and will later throw an exception
if a method that requires a context is called. No 2.3 API's will fail, but
new API's that do require a context might fail.
Also add helper NfcAdapter.getDefaultAdapter(Context).
Change-Id: I9a6378de4ef4b61ad922f8d53e64e2a1a1d5d60c
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index 3b9ab1a..893f2d2 100644 --- a/api/current.xml +++ b/api/current.xml @@ -35673,6 +35673,17 @@ visibility="public" > </field> +<field name="NFC_SERVICE" + type="java.lang.String" + transient="false" + volatile="false" + value=""nfc"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="NOTIFICATION_SERVICE" type="java.lang.String" transient="false" @@ -100183,6 +100194,19 @@ deprecated="not deprecated" visibility="public" > +<parameter name="context" type="android.content.Context"> +</parameter> +</method> +<method name="getDefaultAdapter" + return="android.nfc.NfcAdapter" + abstract="false" + native="false" + synchronized="false" + static="true" + final="false" + deprecated="deprecated" + visibility="public" +> </method> <method name="isEnabled" return="boolean" @@ -100229,6 +100253,26 @@ > </field> </class> +<class name="NfcManager" + extends="java.lang.Object" + abstract="false" + static="false" + final="true" + deprecated="not deprecated" + visibility="public" +> +<method name="getDefaultAdapter" + return="android.nfc.NfcAdapter" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> +</class> </package> <package name="android.opengl" > |