resolved conflicts for merge of 6ce70394 to master (b8a8c7a2) · Commits · e / os / android_frameworks_base

core/java/android/nfc/INfcAdapterExtras.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.nfc;

		import android.nfc.ApduList;
		import android.os.Bundle;


		@@ -29,4 +28,5 @@ interface INfcAdapterExtras {
		Bundle transceive(in byte[] data_in);
		int getCardEmulationRoute();
		void setCardEmulationRoute(int route);
		void authenticate(in byte[] token);
		}

+17 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.nfc_extras;

		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.nfc.ApduList;
		import android.nfc.INfcAdapterExtras;
		import android.nfc.NfcAdapter;
		import android.os.RemoteException;
		@@ -207,4 +206,21 @@ public final class NfcAdapterExtras {
		public NfcExecutionEnvironment getEmbeddedExecutionEnvironment() {
		return sEmbeddedEe;
		}

		/**
		* Authenticate the client application.
		*
		* Some implementations of NFC Adapter Extras may require applications
		* to authenticate with a token, before using other methods.
		*
		* @param a implementation specific token
		* @throws a {@link java.lang.SecurityException} if authentication failed
		*/
		public void authenticate(byte[] token) {
		try {
		sService.authenticate(token);
		} catch (RemoteException e) {
		attemptDeadServiceRecovery(e);
		}
		}
		}