Merge "fix null pointer crash" into mnc-dev

2015-05-14 03:39:45 +00:00
parent c9be9f4d5b 20903b392b
commit a3b9a2240e
1 changed files with 1 additions and 1 deletions
--- 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;