summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernie Innocenti <codewiz@google.com>2018-06-14 19:02:47 +0900
committerBernie Innocenti <codewiz@google.com>2018-06-27 02:49:21 +0000
commit832961f3c4a2d33710bcf0a05fec0d593ff613c3 (patch)
tree2b15f5d81acb1dbf0b02baa622ac4df0fd4b0ae7
parent4c23cef241b5d93d2bf49d620a924911ae1ce916 (diff)
downloadwifi-832961f3c4a2d33710bcf0a05fec0d593ff613c3.tar.gz
Don't crash on readPacketFilter() failure
The crash only occurs when verbose wifi logging is enabled. It interferes with debugging, but doesn't affect regular users. Test: manually, by turning on wifi debugging Bug: 110177912 Change-Id: Ie655f86349394bf0e76a724046aeb2049e614ffe
-rw-r--r--service/java/com/android/server/wifi/WifiVendorHal.java2
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 0d73459b5..50fc0e145 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;