Merge "Make some NFC APIs @systemAPI." into lmp-dev (0bc94550) · Commits · e / os / android_frameworks_base

core/java/android/nfc/NfcAdapter.java

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ import java.util.HashMap;

	import android.annotation.SdkConstant;		import android.annotation.SdkConstant;
	import android.annotation.SdkConstant.SdkConstantType;		import android.annotation.SdkConstant.SdkConstantType;
			import android.annotation.SystemApi;
	import android.app.Activity;		import android.app.Activity;
	import android.app.ActivityThread;		import android.app.ActivityThread;
	import android.app.OnActivityPausedListener;		import android.app.OnActivityPausedListener;
	@@ -261,6 +262,7 @@ public final class NfcAdapter {
	public static final String EXTRA_READER_PRESENCE_CHECK_DELAY = "presence";		public static final String EXTRA_READER_PRESENCE_CHECK_DELAY = "presence";

	/** @hide */		/** @hide */
			@SystemApi
	public static final int FLAG_NDEF_PUSH_NO_CONFIRM = 0x1;		public static final int FLAG_NDEF_PUSH_NO_CONFIRM = 0x1;

	/** @hide */		/** @hide */
	@@ -652,6 +654,7 @@ public final class NfcAdapter {
	*		*
	* @hide		* @hide
	*/		*/
			@SystemApi
	public boolean enable() {		public boolean enable() {
	try {		try {
	return sService.enable();		return sService.enable();
	@@ -679,7 +682,7 @@ public final class NfcAdapter {
	*		*
	* @hide		* @hide
	*/		*/
			@SystemApi
	public boolean disable() {		public boolean disable() {
	try {		try {
	return sService.disable(true);		return sService.disable(true);
	@@ -932,6 +935,7 @@ public final class NfcAdapter {
	/**		/**
	* @hide		* @hide
	*/		*/
			@SystemApi
	public void setNdefPushMessage(NdefMessage message, Activity activity, int flags) {		public void setNdefPushMessage(NdefMessage message, Activity activity, int flags) {
	if (activity == null) {		if (activity == null) {
	throw new NullPointerException("activity cannot be null");		throw new NullPointerException("activity cannot be null");
	@@ -1359,6 +1363,7 @@ public final class NfcAdapter {
	* <p>This API is for the Settings application.		* <p>This API is for the Settings application.
	* @hide		* @hide
	*/		*/
			@SystemApi
	public boolean enableNdefPush() {		public boolean enableNdefPush() {
	try {		try {
	return sService.enableNdefPush();		return sService.enableNdefPush();
	@@ -1373,6 +1378,7 @@ public final class NfcAdapter {
	* <p>This API is for the Settings application.		* <p>This API is for the Settings application.
	* @hide		* @hide
	*/		*/
			@SystemApi
	public boolean disableNdefPush() {		public boolean disableNdefPush() {
	try {		try {
	return sService.disableNdefPush();		return sService.disableNdefPush();