Commit 1e2cad8a authored Mar 28, 2019 by Michael Groover

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

parent a908be90

services/core/java/com/android/server/adb/AdbDebuggingManager.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -307,7 +307,6 @@ public class AdbDebuggingManager {
		}

		cancelJobToUpdateAdbKeyStore();
		mAdbKeyStore = null;
		mConnectedKey = null;
		break;