From e55fe4f3bb19992d8dcfc5cb19528f9a52cdcbb1 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Wed, 9 Jan 2013 12:27:22 -0800 Subject: Make NfcAdapter states public and fix build. Change-Id: Idb2dd5e524cda5e3c03d4f2689266fa03be4ea13 --- api/current.txt | 4 ++++ core/java/android/nfc/NfcAdapter.java | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index 85d20f6456ed..77f3418fa5be 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13793,6 +13793,10 @@ package android.nfc { field public static final java.lang.String EXTRA_ID = "android.nfc.extra.ID"; field public static final java.lang.String EXTRA_NDEF_MESSAGES = "android.nfc.extra.NDEF_MESSAGES"; field public static final java.lang.String EXTRA_TAG = "android.nfc.extra.TAG"; + field public static final int STATE_OFF = 1; // 0x1 + field public static final int STATE_ON = 3; // 0x3 + field public static final int STATE_TURNING_OFF = 4; // 0x4 + field public static final int STATE_TURNING_ON = 2; // 0x2 } public static abstract interface NfcAdapter.CreateBeamUrisCallback { diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index 1963beb74f8b..6ad382b9a53c 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -190,13 +190,9 @@ public final class NfcAdapter { */ public static final String EXTRA_ADAPTER_STATE = "android.nfc.extra.ADAPTER_STATE"; - /** @hide */ public static final int STATE_OFF = 1; - /** @hide */ public static final int STATE_TURNING_ON = 2; - /** @hide */ public static final int STATE_ON = 3; - /** @hide */ public static final int STATE_TURNING_OFF = 4; /** @hide */ -- cgit v1.2.3-59-g8ed1b