diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-28 06:01:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-28 06:01:28 +0000 |
| commit | 76cf3c1f641ef2cc6c16c54a001d3e973feb7af4 (patch) | |
| tree | 32d7ad1e495e98589168f3c8a36c7c455b476e22 | |
| parent | 9903d87381aa374571b933ff5a5e376dfa9850b2 (diff) | |
| parent | 832961f3c4a2d33710bcf0a05fec0d593ff613c3 (diff) | |
Merge "Don't crash on readPacketFilter() failure" into pi-dev
| -rw-r--r-- | service/java/com/android/server/wifi/WifiVendorHal.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiVendorHal.java b/service/java/com/android/server/wifi/WifiVendorHal.java index 361387e2f..2517ba62a 100644 --- a/service/java/com/android/server/wifi/WifiVendorHal.java +++ b/service/java/com/android/server/wifi/WifiVendorHal.java @@ -201,7 +201,7 @@ public class WifiVendorHal { mVerboseLog.err("% returns %") .c(niceMethodName(trace, 3)) - .c(HexDump.dumpHexString(result)) + .c(result == null ? "(null)" : HexDump.dumpHexString(result)) .flush(); return result; |