SEService.shutdown() shall release SE resources for the SEService

src/org/simalliance/openmobileapi/service/Session.java

@@ -41,15 +41,18 @@ public class Session {
     private final Terminal mReader;
     private Context mContext;
     private boolean mIsClosed;
+    private int mClientId;
+
     /**
      * List of open channels in use by this client.
      */
     private final List<Channel> mChannels = new ArrayList<>();
 
     private final Object mLock = new Object();
 
-    public Session(Terminal reader, Context context) {
+    public Session(Terminal reader, int clientId, Context context) {
         mReader = reader;
+        mClientId = clientId;
         mIsClosed = false;
         mContext = context;
     }
@@ -62,6 +65,10 @@ public Terminal getReader() {
         return mReader;
     }
 
+    public int getClientId() {
+        return mClientId;
+    }
+
     public byte[] getAtr() throws RemoteException {
         return mReader.getAtr();
     }

src/org/simalliance/openmobileapi/service/Terminal.java

@@ -36,7 +36,7 @@
 import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.NoSuchElementException;
-
+import java.util.concurrent.atomic.AtomicInteger;
 
 import android.content.pm.PackageManager;
 import android.util.Log;
@@ -62,6 +62,8 @@ public class Terminal {
 
     private final Object mLock = new Object();
 
+    private AtomicInteger mIdGenerator = new AtomicInteger(0);
+
     /* Async task */
     InitialiseTask mInitialiseTask;
 
@@ -223,7 +225,7 @@ public void onSmartcardServiceShutdown() {
         mContext.unbindService(mTerminalConnection);
     }
 
-    public ISmartcardServiceSession openSession() throws Exception {
+    public ISmartcardServiceSession openSession(int clientId) throws Exception {
         if (!isCardPresent()) {
             throw new IOException("Secure Element is not presented.");
         }
@@ -232,7 +234,7 @@ public ISmartcardServiceSession openSession() throws Exception {
             if (mAccessControlEnforcer == null || !mAccessControlEnforcer.isInitialized()) {
                 initializeAccessControl(false);
             }
-            Session session = new Session(this, mContext);
+            Session session = new Session(this, clientId, mContext);
             mSessions.add(session);
             return session.getBinder();
         }
@@ -253,6 +255,19 @@ private synchronized void closeSessions() throws Exception {
         }
     }
 
+    private synchronized void closeSessions(int clientId) throws Exception {
+        int count = mSessions.size();
+        int index = 0;
+
+        for (int i = 0; i < count; i++) {
+            if (clientId == mSessions.get(index).getClientId()) {
+                mSessions.get(index).close();
+            } else {
+                index++;
+            }
+        }
+    }
+
     public Channel getBasicChannel() {
         for (Session session : mSessions) {
             Channel basicChannel = session.getBasicChannel();
@@ -558,6 +573,12 @@ private synchronized void resetAccessControl() {
      */
     private class SmartcardServiceReader extends ISmartcardServiceReader.Stub {
 
+        private int mId;
+
+        public SmartcardServiceReader() {
+            mId = mIdGenerator.getAndIncrement();
+        }
+
         @Override
         public boolean isSecureElementPresent() throws RemoteException {
             return Terminal.this.isCardPresent();
@@ -566,7 +587,7 @@ public boolean isSecureElementPresent() throws RemoteException {
         @Override
         public ISmartcardServiceSession openSession(SmartcardError error) throws RemoteException {
             try {
-                return Terminal.this.openSession();
+                return Terminal.this.openSession(mId);
             } catch (Exception e) {
                 Log.e(SmartcardService.LOG_TAG, "Error during openSession()", e);
                 error.set(e);
@@ -577,7 +598,7 @@ public ISmartcardServiceSession openSession(SmartcardError error) throws RemoteE
         @Override
         public void closeSessions(SmartcardError error) throws RemoteException {
             try {
-                Terminal.this.closeSessions();
+                Terminal.this.closeSessions(mId);
             } catch (Exception e) {
                 Log.e(SmartcardService.LOG_TAG, "Error during closeSessions()", e);
                 error.set(e);