fix null pointer crash

(cherry-picked from mirror-m-wireless-internal-release
216d8c3 fix null pointer crash)

Bug: 20232584

Change-Id: I7c46e372bc8f3a54b0428ef56c034eb2c79133ea

diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 5e99672..030a5d5 100644 (file)
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -1057,7 +1057,7 @@ public class WifiManager {
             }
             synchronized(this) {
                 record = mService.reportActivityInfo();
-                if (record.isValid()) {
+                if (record != null && record.isValid()) {
                     return record;
                 } else {
                     return null;