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

Merge "Add a setting to disable HIDL HALs" into sc-dev

Browse Source
This commit is contained in:
Ilya Matyukhin
2021-04-02 23:24:03 +00:00
committed by Android (Google) Code Review
parent 06a5b97f6a 07bc05008f
commit 9b9bf70eb5
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/core/java/com/android/server/biometrics/AuthService.java
View File

@@ -48,10 +48,12 @@ import android.hardware.face.IFaceService;
import android.hardware.fingerprint.IFingerprintService; import android.hardware.fingerprint.IFingerprintService;
import android.hardware.iris.IIrisService; import android.hardware.iris.IIrisService;
import android.os.Binder; import android.os.Binder;
import android.os.Build;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings;
import android.util.Slog; import android.util.Slog;
import com.android.internal.R; import com.android.internal.R;
@@ -70,6 +72,9 @@ import java.util.List;
public class AuthService extends SystemService { public class AuthService extends SystemService {
private static final String TAG = "AuthService"; private static final String TAG = "AuthService";
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
private static final String SETTING_HIDL_DISABLED =
"com.android.server.biometrics.AuthService.hidlDisabled";
private static final int DEFAULT_HIDL_DISABLED = 0;
private final Injector mInjector; private final Injector mInjector;
@@ -142,6 +147,18 @@ public class AuthService extends SystemService {
public AppOpsManager getAppOps(Context context) { public AppOpsManager getAppOps(Context context) {
return context.getSystemService(AppOpsManager.class); return context.getSystemService(AppOpsManager.class);
} }
/**
* Allows to ignore HIDL HALs on debug builds based on a secure setting.
*/
@VisibleForTesting
public boolean isHidlDisabled(Context context) {
if (Build.IS_ENG || Build.IS_USERDEBUG) {
return Settings.Secure.getIntForUser(context.getContentResolver(),
SETTING_HIDL_DISABLED, DEFAULT_HIDL_DISABLED, UserHandle.USER_CURRENT) == 1;
}
return false;
}
} }
private final class AuthServiceImpl extends IAuthService.Stub { private final class AuthServiceImpl extends IAuthService.Stub {
@@ -561,12 +578,14 @@ public class AuthService extends SystemService {
public void onStart() { public void onStart() {
mBiometricService = mInjector.getBiometricService(); mBiometricService = mInjector.getBiometricService();
final String[] configs = mInjector.getConfiguration(getContext()); if (!mInjector.isHidlDisabled(getContext())) {
for (String config : configs) { final String[] configs = mInjector.getConfiguration(getContext());
try { for (String config : configs) {
registerAuthenticator(new SensorConfig(config)); try {
} catch (RemoteException e) { registerAuthenticator(new SensorConfig(config));
Slog.e(TAG, "Remote exception", e); } catch (RemoteException e) {
Slog.e(TAG, "Remote exception", e);
}
} }
} }

1
services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java
View File

@@ -96,6 +96,7 @@ public class AuthServiceTest {
when(mInjector.getFaceService()).thenReturn(mFaceService); when(mInjector.getFaceService()).thenReturn(mFaceService);
when(mInjector.getIrisService()).thenReturn(mIrisService); when(mInjector.getIrisService()).thenReturn(mIrisService);
when(mInjector.getAppOps(any())).thenReturn(mAppOpsManager); when(mInjector.getAppOps(any())).thenReturn(mAppOpsManager);
when(mInjector.isHidlDisabled(any())).thenReturn(false);
} }
@Test @Test