Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not call to SecureElement Service if device does not support any OMAPI readers"

Browse Source
This commit is contained in:
Treehugger Robot
2019-12-19 11:29:08 +00:00
committed by Gerrit Code Review
parent edf7ce4f38 3fd7f89490
commit 98a96a40c6
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java/android/se/omapi/SEService.java
View File

@@ -22,11 +22,14 @@
package android.se.omapi;
import android.app.ActivityThread;
import android.annotation.NonNull;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.os.IBinder;
import android.os.RemoteException;
import android.util.Log;
@@ -140,6 +143,10 @@ public final class SEService {
throw new NullPointerException("Arguments must not be null");
}
if (!hasOMAPIReaders()) {
throw new UnsupportedOperationException("Device does not support any OMAPI reader");
}
mContext = context;
mSEListener.mListener = listener;
mSEListener.mExecutor = executor;
@@ -270,4 +277,23 @@ public final class SEService {
throw new IllegalStateException(e.getMessage());
}
}
/**
* Helper to check if this device support any OMAPI readers
*/
private static boolean hasOMAPIReaders() {
IPackageManager pm = ActivityThread.getPackageManager();
if (pm == null) {
Log.e(TAG, "Cannot get package manager, assuming OMAPI readers supported");
return true;
}
try {
return pm.hasSystemFeature(PackageManager.FEATURE_SE_OMAPI_UICC, 0)
|| pm.hasSystemFeature(PackageManager.FEATURE_SE_OMAPI_ESE, 0)
|| pm.hasSystemFeature(PackageManager.FEATURE_SE_OMAPI_SD, 0);
} catch (RemoteException e) {
Log.e(TAG, "Package manager query failed, assuming OMAPI readers supported", e);
return true;
}
}
}