summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorErik Wolsheimer <ewol@google.com>2017-05-02 19:57:15 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-02 19:57:15 +0000
commitf1121f5224fcf1b6b6ef107ef96c555148d2415e (patch)
tree3e73d6aed3ac7225c03942a0735fc00065b0bac6 /service
parentb26099c77dba564e621440a191d1158043a360d9 (diff)
parent0dffd1db0778b502198256e3d7a7a75976867cef (diff)
DO NOT MERGE Add missing null check to WifiStateMachine#dump
am: 0dffd1db07 Change-Id: I905f4e948536e16a2b7f081994123d055d72320d
Diffstat (limited to 'service')
-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 89aabcf3e..0d33ba32d 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -2329,7 +2329,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();