Merge "Remove key from adb_keys if user forgets the key." into rvc-dev

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

@@ -1853,6 +1853,7 @@ public class AdbDebuggingManager {
         public void removeKey(String key) {
             if (mKeyMap.containsKey(key)) {
                 mKeyMap.remove(key);
+                writeKeys(mKeyMap.keySet());
                 sendPersistKeyStoreMessage();
             }
         }

services/tests/servicestests/src/com/android/server/adb/AdbDebuggingManagerTest.java

@@ -696,6 +696,31 @@ public final class AdbDebuggingManagerTest {
                 mAdbKeyXmlFile.exists());
     }
 
+    @Test
+    public void testAdbKeyStore_removeKey() throws Exception {
+        // Accept the test key with the 'Always allow' option selected.
+        runAdbTest(TEST_KEY_1, true, true, false);
+        runAdbTest(TEST_KEY_2, true, true, false);
+
+        // Set the connection time to 0 to restore the original behavior.
+        setAllowedConnectionTime(0);
+
+        // Verify that the key is in the adb_keys file to ensure subsequent connections are
+        // automatically allowed by adbd.
+        persistKeyStore();
+        assertTrue("The key was not in the adb_keys file after persisting the keystore",
+                isKeyInFile(TEST_KEY_1, mAdbKeyFile));
+        assertTrue("The key was not in the adb_keys file after persisting the keystore",
+                isKeyInFile(TEST_KEY_2, mAdbKeyFile));
+
+        // Now remove one of the keys and make sure the other key is still there
+        mKeyStore.removeKey(TEST_KEY_1);
+        assertFalse("The key was still in the adb_keys file after removing the key",
+                isKeyInFile(TEST_KEY_1, mAdbKeyFile));
+        assertTrue("The key was not in the adb_keys file after removing a different key",
+                isKeyInFile(TEST_KEY_2, mAdbKeyFile));
+    }
+
     /**
      * Runs an adb test with the provided configuration.
      *