diff --git a/config/common.mk b/config/common.mk
index 5e65542..93e4a9e 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -55,11 +55,10 @@ endif
 # ---------------------------------------------------------------------------
 # ADB security
 # ---------------------------------------------------------------------------
-ifeq ($(TARGET_BUILD_VARIANT),eng)
-PRODUCT_SYSTEM_EXT_PROPERTIES += ro.adb.secure=0
-else
+ifeq ($(TARGET_BUILD_VARIANT),user)
 PRODUCT_SYSTEM_EXT_PROPERTIES += ro.adb.secure=1
-PRODUCT_NOT_DEBUGGABLE_IN_USERDEBUG := true
+else
+PRODUCT_SYSTEM_EXT_PROPERTIES += ro.adb.secure=0
 endif
 
 # ---------------------------------------------------------------------------