Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ca06468 authored by Eric Biggers's avatar Eric Biggers
Browse files

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
parent d46a6d2a

services/core/java/com/android/server/adb/AdbDebuggingManager.java

+0 −9
Original line number Diff line number Diff line
@@ -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) {