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 am: 4e10d57e34 am: fc31ef0de9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11839906

Change-Id: I13756e8744a2410ce02ac6ffe42f67276ce4c037
This commit is contained in:
TreeHugger Robot
2020-06-11 22:06:37 +00:00
committed by Automerger Merge Worker
parent cb8e6c3336 fc31ef0de9
commit e23ab76b03
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) {
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());