From 0dffd1db0778b502198256e3d7a7a75976867cef Mon Sep 17 00:00:00 2001 From: Erik Wolsheimer Date: Mon, 1 May 2017 15:53:35 -0700 Subject: DO NOT MERGE Add missing null check to WifiStateMachine#dump Bug: 33932575 Change-Id: If84866598eb4b0482f93dc3256c4dcb4d5182469 --- service/java/com/android/server/wifi/WifiStateMachine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 9d8a66f2d..92fcd81bd 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -2313,7 +2313,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss @Override public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { - if (args.length > 1 && WifiMetrics.PROTO_DUMP_ARG.equals(args[0]) + if ((args != null) && args.length > 1 && WifiMetrics.PROTO_DUMP_ARG.equals(args[0]) && WifiMetrics.CLEAN_DUMP_ARG.equals(args[1])) { // Dump only wifi metrics serialized proto bytes (base64) updateWifiMetrics(); -- cgit v1.2.3