From 9e3cb5ab6c597cd0a79cdf438004b215f889d836 Mon Sep 17 00:00:00 2001
From: "chihhao.chen" <chihhao.chen@mediatek.com>
Date: Fri, 5 Jun 2020 16:44:46 +0800
Subject: [PATCH] Let confirmation dialog can appear

When eng/userdebug load is with user build adbd, we
need to always new AdbDebuggingManager to let confirmation
dialog can appear.

Bug: 158156979
Test: "adb shell" can trigger confirmation dialog
Change-Id: Ia0830c78c8cc913985f41b93eeecf8bf57ec1b03
---
 services/core/java/com/android/server/adb/AdbService.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/services/core/java/com/android/server/adb/AdbService.java b/services/core/java/com/android/server/adb/AdbService.java
index 7aaf9be1fdd29..b75a57d51f17a 100644
--- a/services/core/java/com/android/server/adb/AdbService.java
+++ b/services/core/java/com/android/server/adb/AdbService.java
@@ -241,12 +241,7 @@ public class AdbService extends IAdbManager.Stub {
     private AdbService(Context context) {
         mContext = context;
         mContentResolver = context.getContentResolver();
-
-        boolean secureAdbEnabled = AdbProperties.secure().orElse(false);
-        boolean dataEncrypted = "1".equals(SystemProperties.get("vold.decrypt"));
-        if (secureAdbEnabled && !dataEncrypted) {
-            mDebuggingManager = new AdbDebuggingManager(context);
-        }
+        mDebuggingManager = new AdbDebuggingManager(context);
 
         initAdbState();
         LocalServices.addService(AdbManagerInternal.class, new AdbManagerInternalImpl());