From 8ca06468bb56fddc33d4c9dbc09bfeceb38ab924 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 11 Apr 2022 22:38:13 +0000 Subject: [PATCH] adb: stop checking for CryptKeeper mode Since support for Full Disk Encryption was removed in favor of File Based Encryption, "CryptKeeper mode" no longer exists and the "vold.decrypt" system property is never set. Therefore, remove the unused code from AdbDebuggingManager that deferred the adb confirmation in CryptKeeper mode. Bug: 208476087 Change-Id: I1f289e1257115b51af4eb12ea45734831cc2d0cf --- .../java/com/android/server/adb/AdbDebuggingManager.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/services/core/java/com/android/server/adb/AdbDebuggingManager.java b/services/core/java/com/android/server/adb/AdbDebuggingManager.java index 297d28dadde3c..ad89afb791cca 100644 --- a/services/core/java/com/android/server/adb/AdbDebuggingManager.java +++ b/services/core/java/com/android/server/adb/AdbDebuggingManager.java @@ -892,15 +892,6 @@ public class AdbDebuggingManager { case MESSAGE_ADB_CONFIRM: { String key = (String) msg.obj; - if ("trigger_restart_min_framework".equals( - SystemProperties.get("vold.decrypt"))) { - Slog.w(TAG, "Deferring adb confirmation until after vold decrypt"); - if (mThread != null) { - mThread.sendResponse("NO"); - logAdbConnectionChanged(key, AdbProtoEnums.DENIED_VOLD_DECRYPT, false); - } - break; - } String fingerprints = getFingerprints(key); if ("".equals(fingerprints)) { if (mThread != null) {