summaryrefslogtreecommitdiffstats
path: root/service/java/com
diff options
context:
space:
mode:
authorErik Wolsheimer <ewol@google.com>2017-05-01 15:53:35 -0700
committerErik Wolsheimer <ewol@google.com>2017-05-02 11:20:08 -0700
commit0dffd1db0778b502198256e3d7a7a75976867cef (patch)
tree6634b60ce2c5a8ebf2df051d9037951e70c48188 /service/java/com
parent04618bb38669b709553d01b7bb29ce1ed8db073d (diff)
downloadandroid_frameworks_opt_net_wifi-0dffd1db0778b502198256e3d7a7a75976867cef.tar.gz
android_frameworks_opt_net_wifi-0dffd1db0778b502198256e3d7a7a75976867cef.tar.bz2
android_frameworks_opt_net_wifi-0dffd1db0778b502198256e3d7a7a75976867cef.zip
DO NOT MERGE Add missing null check to WifiStateMachine#dump
Bug: 33932575 Change-Id: If84866598eb4b0482f93dc3256c4dcb4d5182469
Diffstat (limited to 'service/java/com')
-rw-r--r--service/java/com/android/server/wifi/WifiStateMachine.java2
1 files changed, 1 insertions, 1 deletions
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();