Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Let confirmation dialog can appear" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-11 21:44:27 +00:00
committed by Android (Google) Code Review
parent e59c61585e 676fe13584
commit 4e10d57e34
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/adb/AdbService.java
View File

@@ -241,12 +241,7 @@ public class AdbService extends IAdbManager.Stub {
private AdbService(Context context) { private AdbService(Context context) {
mContext = context; mContext = context;
mContentResolver = context.getContentResolver(); mContentResolver = context.getContentResolver();
mDebuggingManager = new AdbDebuggingManager(context);
boolean secureAdbEnabled = AdbProperties.secure().orElse(false);
boolean dataEncrypted = "1".equals(SystemProperties.get("vold.decrypt"));
if (secureAdbEnabled && !dataEncrypted) {
mDebuggingManager = new AdbDebuggingManager(context);
}
initAdbState(); initAdbState();
LocalServices.addService(AdbManagerInternal.class, new AdbManagerInternalImpl()); LocalServices.addService(AdbManagerInternal.class, new AdbManagerInternalImpl());