Merge "Add hidden API for pausing and resuming NFC polling." into lmp-dev (bd9d6647) · Commits · e / os / android_frameworks_base

core/java/android/nfc/INfcAdapter.aidl

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,8 @@ interface INfcAdapter
	boolean enableNdefPush();		boolean enableNdefPush();
	boolean disableNdefPush();		boolean disableNdefPush();
	boolean isNdefPushEnabled();		boolean isNdefPushEnabled();
			void pausePolling(int timeoutInMs);
			void resumePolling();

	void setForegroundDispatch(in PendingIntent intent,		void setForegroundDispatch(in PendingIntent intent,
	in IntentFilter[] filters, in TechListParcel techLists);		in IntentFilter[] filters, in TechListParcel techLists);

+27 −0

Original line number	Original line	Diff line number	Diff line
	@@ -701,6 +701,33 @@ public final class NfcAdapter {
	}		}
	}		}

			/**
			* Pauses polling for a {@code timeoutInMs} millis. If polling must be resumed before timeout,
			* use {@link #resumePolling()}.
			* @hide
			*/
			public void pausePolling(int timeoutInMs) {
			try {
			sService.pausePolling(timeoutInMs);
			} catch (RemoteException e) {
			attemptDeadServiceRecovery(e);
			}
			}

			/**
			* Resumes default polling for the current device state if polling is paused. Calling
			* this while polling is not paused is a no-op.
			*
			* @hide
			*/
			public void resumePolling() {
			try {
			sService.resumePolling();
			} catch (RemoteException e) {
			attemptDeadServiceRecovery(e);
			}
			}

	/**		/**
	* Set one or more {@link Uri}s to send using Android Beam (TM). Every		* Set one or more {@link Uri}s to send using Android Beam (TM). Every
	* Uri you provide must have either scheme 'file' or scheme 'content'.		* Uri you provide must have either scheme 'file' or scheme 'content'.