Merge "Fix connect duration for un-established SIP calls." into gingerbread
diff --git a/api/current.xml b/api/current.xml
index b7e967a..d36fe69 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -100436,7 +100436,7 @@
visibility="public"
>
</method>
-<method name="isTagDiscoveryEnabled"
+<method name="isEnabled"
return="boolean"
abstract="false"
native="false"
diff --git a/core/java/android/nfc/INfcTag.aidl b/core/java/android/nfc/INfcTag.aidl
index 2171434..13b97d6 100644
--- a/core/java/android/nfc/INfcTag.aidl
+++ b/core/java/android/nfc/INfcTag.aidl
@@ -28,6 +28,7 @@
String getType(int nativeHandle);
byte[] getUid(int nativeHandle);
boolean isNdef(int nativeHandle);
+ boolean isPresent(int nativeHandle);
byte[] transceive(int nativeHandle, in byte[] data);
int getLastError(int nativeHandle);
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java
index bc3c6d9..6884abb 100644
--- a/core/java/android/nfc/NfcAdapter.java
+++ b/core/java/android/nfc/NfcAdapter.java
@@ -227,14 +227,17 @@
}
/**
- * Return true if this NFC Adapter is enabled to discover new tags.
+ * Return true if this NFC Adapter has any features enabled.
* <p>
* If this method returns false, then applications should request the user
* turn on NFC tag discovery in Settings.
+ * <p>
+ * If this method returns false, the NFC hardware is guaranteed not to
+ * perform or respond to any NFC communication.
*
* @return true if this NFC Adapter is enabled to discover new tags
*/
- public boolean isTagDiscoveryEnabled() {
+ public boolean isEnabled() {
try {
return mService.isEnabled();
} catch (RemoteException e) {
@@ -244,12 +247,14 @@
}
/**
+ * Enable NFC hardware.
+ * <p>
* NOTE: may block for ~second or more. Poor API. Avoid
* calling from the UI thread.
*
* @hide
*/
- public boolean enableTagDiscovery() {
+ public boolean enable() {
try {
return mService.enable();
} catch (RemoteException e) {
@@ -259,12 +264,16 @@
}
/**
+ * Disable NFC hardware.
+ * No NFC features will work after this call, and the hardware
+ * will not perform or respond to any NFC communication.
+ * <p>
* NOTE: may block for ~second or more. Poor API. Avoid
* calling from the UI thread.
*
* @hide
*/
- public boolean disableTagDiscovery() {
+ public boolean disable() {
try {
return mService.disable();
} catch (RemoteException e) {
diff --git a/core/java/android/nfc/RawTagConnection.java b/core/java/android/nfc/RawTagConnection.java
index 265eb1b..1261db1 100644
--- a/core/java/android/nfc/RawTagConnection.java
+++ b/core/java/android/nfc/RawTagConnection.java
@@ -95,10 +95,16 @@
* returns true.
*/
public boolean isConnected() {
- // TODO(nxp): update mIsConnected when tag goes out of range -
- // but do not do an active prescence check in
- // isConnected()
- return mIsConnected;
+ if (!mIsConnected) {
+ return false;
+ }
+
+ try {
+ return mTagService.isPresent(mTag.mNativeHandle);
+ } catch (RemoteException e) {
+ Log.e(TAG, "NFC service died", e);
+ return false;
+ }
}
/**
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 90cd840..5aa22fb 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1640,86 +1640,6 @@
public static final String NOTIFICATION_LIGHT_PULSE = "notification_light_pulse";
/**
- * Whether nfc is enabled/disabled
- * 0=disabled. 1=enabled.
- * @hide
- */
- public static final String NFC_ON = "nfc_on";
-
- /**
- * Whether nfc secure element is enabled/disabled
- * 0=disabled. 1=enabled.
- * @hide
- */
- public static final String NFC_SECURE_ELEMENT_ON = "nfc_secure_element_on";
-
- /**
- * Whether nfc secure element is enabled/disabled
- * 0=disabled. 1=enabled.
- * @hide
- */
- public static final String NFC_SECURE_ELEMENT_ID = "nfc_secure_element_id";
-
- /**
- * LLCP LTO value
- * @hide
- */
- public static final String NFC_LLCP_LTO = "nfc_llcp_lto";
-
- /**
- * LLCP MIU value
- * @hide
- */
- public static final String NFC_LLCP_MIU = "nfc_llcp_miu";
-
- /**
- * LLCP WKS value
- * @hide
- */
- public static final String NFC_LLCP_WKS = "nfc_llcp_wks";
-
- /**
- * LLCP OPT value
- * @hide
- */
- public static final String NFC_LLCP_OPT = "nfc_llcp_opt";
-
- /**
- * NFC Discovery Reader A
- * 0=disabled. 1=enabled.
- * @hide
- */
- public static final String NFC_DISCOVERY_A = "nfc_discovery_a";
-
- /**
- * NFC Discovery Reader B
- * 0=disabled. 1=enabled.
- * @hide
- */
- public static final String NFC_DISCOVERY_B = "nfc_discovery_b";
-
- /**
- * NFC Discovery Reader Felica
- * 0=disabled. 1=enabled.
- * @hide
- */
- public static final String NFC_DISCOVERY_F = "nfc_discovery_felica";
-
- /**
- * NFC Discovery Reader 15693
- * 0=disabled. 1=enabled.
- * @hide
- */
- public static final String NFC_DISCOVERY_15693 = "nfc_discovery_15693";
-
- /**
- * NFC Discovery NFCIP
- * 0=disabled. 1=enabled.
- * @hide
- */
- public static final String NFC_DISCOVERY_NFCIP = "nfc_discovery_nfcip";
-
- /**
* Show pointer location on screen?
* 0 = no
* 1 = yes
@@ -1885,18 +1805,6 @@
NOTIFICATION_LIGHT_PULSE,
SIP_CALL_OPTIONS,
SIP_RECEIVE_CALLS,
- NFC_ON,
- NFC_SECURE_ELEMENT_ON,
- NFC_SECURE_ELEMENT_ID,
- NFC_LLCP_LTO,
- NFC_LLCP_MIU,
- NFC_LLCP_WKS,
- NFC_LLCP_OPT,
- NFC_DISCOVERY_A,
- NFC_DISCOVERY_B,
- NFC_DISCOVERY_F,
- NFC_DISCOVERY_15693,
- NFC_DISCOVERY_NFCIP,
};
// Settings moved to Settings.Secure