Merge "Wrap raw binder interface into public classes" (a4bde270) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −12

Original line number	Diff line number	Diff line
		@@ -37032,17 +37032,6 @@ package android.se.omapi {
		method public byte[] transmit(byte[]) throws java.io.IOException;
		}

		public abstract interface ISecureElementListener implements android.os.IInterface {
		method public abstract void serviceConnected() throws android.os.RemoteException;
		}

		public static abstract class ISecureElementListener.Stub extends android.os.Binder implements android.se.omapi.ISecureElementListener {
		ctor public ISecureElementListener.Stub();
		method public android.os.IBinder asBinder();
		method public static android.se.omapi.ISecureElementListener asInterface(android.os.IBinder);
		method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException;
		}

		public class Reader {
		method public void closeSessions();
		method public java.lang.String getName();
		@@ -37052,13 +37041,19 @@ package android.se.omapi {
		}

		public class SEService {
		ctor public SEService(android.content.Context, android.se.omapi.ISecureElementListener);
		ctor public SEService(android.content.Context, android.se.omapi.SEService.SecureElementListener);
		method public android.se.omapi.Reader[] getReaders();
		method public java.lang.String getVersion();
		method public boolean isConnected();
		method public void shutdown();
		}

		public static abstract class SEService.SecureElementListener extends android.os.Binder {
		ctor public SEService.SecureElementListener();
		method public android.os.IBinder asBinder();
		method public void serviceConnected();
		}

		public class Session {
		method public void close();
		method public void closeChannels();

core/java/android/se/omapi/ISecureElementListener.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ package android.se.omapi;

		/**
		* Interface to receive call-backs when the service is connected.
		* @hide
		*/
		interface ISecureElementListener {
		/**

core/java/android/se/omapi/SEService.java

+17 −2

Original line number	Diff line number	Diff line
		@@ -59,6 +59,21 @@ public class SEService {
		*/
		public static final int NO_SUCH_ELEMENT_ERROR = 2;

		/**
		* Interface to send call-backs to the application when the service is connected.
		*/
		public abstract static class SecureElementListener extends ISecureElementListener.Stub {
		@Override
		public IBinder asBinder() {
		return this;
		}

		/**
		* Called by the framework when the service is connected.
		*/
		public void serviceConnected() {};
		}

		private static final String TAG = "OMAPI.SEService";

		private final Object mLock = new Object();
		@@ -98,9 +113,9 @@ public class SEService {
		* the context of the calling application. Cannot be
		* <code>null</code>.
		* @param listener
		* a ISecureElementListener object. Can be <code>null</code>.
		* a SecureElementListener object. Can be <code>null</code>.
		*/
		public SEService(Context context, ISecureElementListener listener) {
		public SEService(Context context, SecureElementListener listener) {

		if (context == null) {
		throw new NullPointerException("context must not be null");