Merge "Fix NullPointer Exception in testharness command"

2021-04-26 22:46:57 +00:00
parent f9169bbb09 134e4026c7
commit 881c4ad3e2
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/testharness/TestHarnessModeService.java
+++ b/services/core/java/com/android/server/testharness/TestHarnessModeService.java
@@ -286,6 +286,9 @@ public class TestHarnessModeService extends SystemService {
    private class TestHarnessModeShellCommand extends ShellCommand {
        @Override
        public int onCommand(String cmd) {
+            if (cmd == null) {
+                return handleDefaultCommands(cmd);
+            }
            switch (cmd) {
                case "enable":
                case "restore":