From 20903b392b78e5f3dc0ce8b782154adc77853468 Mon Sep 17 00:00:00 2001
From: Pierre Vandwalle <vandwalle@google.com>
Date: Fri, 8 May 2015 16:07:04 -0700
Subject: [PATCH] fix null pointer crash

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

Bug: 20232584

Change-Id: I7c46e372bc8f3a54b0428ef56c034eb2c79133ea
---
 wifi/java/android/net/wifi/WifiManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 5e996725007f..030a5d5ca52a 100644
--- 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;
-- 
2.11.0