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

Merge "Let confirmation dialog can appear" am: c98338dec0

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

Change-Id: I3e1a1f469ad07235d82225d990b9ad1a5f22a4fd
This commit is contained in:
Josh Gao
2020-06-10 21:08:17 +00:00
committed by Automerger Merge Worker
parent f8c6eb678b c98338dec0
commit edcbeec0fb
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());