From 134e4026c71ec8f0a68064d0cfd9d5d16e71c746 Mon Sep 17 00:00:00 2001
From: Naga Venkata Durga Ashok Mutyala <quic_nmutya@quicinc.com>
Date: Tue, 13 Apr 2021 14:54:34 +0000
Subject: [PATCH] Fix NullPointer Exception in testharness command

Bug: 185214362
Test: adb shell cmd testharness

Change-Id: I7954e0b178174e8bd56512e7a9694448d6bc39e6
---
 .../com/android/server/testharness/TestHarnessModeService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/testharness/TestHarnessModeService.java b/services/core/java/com/android/server/testharness/TestHarnessModeService.java
index 531136976c817..64ca85e3f09a2 100644
--- 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":