summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Haining Chen <hainingc@google.com> 2023-08-23 18:42:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-23 18:42:50 +0000
commit86cbb08ea9d7afe85eca048d783d39fbcf287ab5 (patch)
treeb52bd0365a5e43e6920cde6edca2e6012a5d9533
parentd34d298fedf58d4daac679676058bf4359f022d9 (diff)
parente451fd2ba0e024a0d914493dd3021216c5f3b989 (diff)
Merge "Enable the biometric verification feature by default" into udc-qpr-dev am: e451fd2ba0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24373971 Change-Id: Ic260430927c31de9e6b2bb1c0e5c85e62ffd1fbb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/BinaryTransparencyService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/BinaryTransparencyService.java b/services/core/java/com/android/server/BinaryTransparencyService.java
index 8fc30e43d1a0..e11c028f34ad 100644
--- a/services/core/java/com/android/server/BinaryTransparencyService.java
+++ b/services/core/java/com/android/server/BinaryTransparencyService.java
@@ -80,9 +80,9 @@ import android.util.apk.ApkSignatureVerifier;
import android.util.apk.ApkSigningBlockUtils;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.modules.expresslog.Histogram;
import com.android.internal.os.IBinaryTransparencyService;
import com.android.internal.util.FrameworkStatsLog;
+import com.android.modules.expresslog.Histogram;
import com.android.server.pm.ApexManager;
import com.android.server.pm.pkg.AndroidPackage;
import com.android.server.pm.pkg.AndroidPackageSplit;
@@ -1391,7 +1391,7 @@ public class BinaryTransparencyService extends SystemService {
// Check the flag to determine whether biometric property verification is enabled. It's
// disabled by default.
if (!DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BIOMETRICS,
- KEY_ENABLE_BIOMETRIC_PROPERTY_VERIFICATION, false)) {
+ KEY_ENABLE_BIOMETRIC_PROPERTY_VERIFICATION, true)) {
if (DEBUG) {
Slog.d(TAG, "Do not collect/verify biometric properties. Feature disabled by "
+ "DeviceConfig");