commit af2e62b329639f3f19e5f86afdbaa73af9b245f1
author SagarMakhar <sagarmakhar@gmail.com> Wed Jan 05 07:59:43 2022 +0000
committer Jackeagle <jackeagle102@gmail.com> Thu Mar 10 05:17:28 2022 -0500
tree eb96c82e0bd761e2fd6515856d2d33d670ca998d
parent 013fdd4a03e0194c34dec6023dc057a5146f465a

Disable adb auth if ro.adb.secure is false

- Safetynet hack in init rewrites
    ro.boot.verifiedbootstate=orange to green
    ro.debuggable=1 to 0

- adbd expects either ro.boot.verifiedbootstate=orange or ro.debuggable=1 to skip adb auth

Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>
Change-Id: If0e000131572ca841711d887144afc40dec3e030
Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>
Signed-off-by: Jackeagle <jackeagle102@gmail.com>

daemon/main.cpp

diff --git a/daemon/main.cpp b/daemon/main.cpp
index a200d28..bad44dc 100644
--- a/daemon/main.cpp
+++ b/daemon/main.cpp
@@ -208,11 +208,11 @@
     adbd_cloexec_auth_socket();
 
 #if defined(__ANDROID__)
-    // If we're on userdebug/eng or the device is unlocked, permit no-authentication.
-    bool device_unlocked = "orange" == android::base::GetProperty("ro.boot.verifiedbootstate", "");
-    if (__android_log_is_debuggable() || device_unlocked) {
-        auth_required = android::base::GetBoolProperty("ro.adb.secure", false);
-    }
+    // If ro.adb.secure is false, permit no-authentication.
+    auth_required = android::base::GetBoolProperty("ro.adb.secure", false);
+#if defined(__ANDROID_RECOVERY__)
+    auth_required |= android::base::GetBoolProperty("ro.adb.secure.recovery", true);
+#endif
 #endif
 
     // Our external storage path may be different than apps, since