| commit | 1e2cad8a3d0bdea1ac173ebe1a540ccce74fe91a | [log] [tgz] |
|---|---|---|
| author | Michael Groover <mpgroover@google.com> | Thu Mar 28 18:30:40 2019 -0700 |
| committer | Michael Groover <mpgroover@google.com> | Thu Mar 28 18:30:40 2019 -0700 |
| tree | 86c6ddb399509acfb842be56e34c3719075307a4 | |
| parent | a908be90badb36dd33c5e62a77d94f55bf5231df [diff] |
Do not set AdbKeyStore to null when ADB is disabled
This will allow a user to clear adb authorizations after
disabling adb.
Fixes: 129469524
Test: Manually verified NPE did not occur after disabling adb
and clearing authorizations.
Change-Id: Ia8a13c7011748a5a825e6fd07cc493593d479ba6
diff --git a/services/core/java/com/android/server/adb/AdbDebuggingManager.java b/services/core/java/com/android/server/adb/AdbDebuggingManager.java index 8ccb6e2..9325d25 100644 --- a/services/core/java/com/android/server/adb/AdbDebuggingManager.java +++ b/services/core/java/com/android/server/adb/AdbDebuggingManager.java
@@ -307,7 +307,6 @@ } cancelJobToUpdateAdbKeyStore(); - mAdbKeyStore = null; mConnectedKey = null; break;