diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-05-14 03:39:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 03:40:04 +0000 |
| commit | a3b9a2240ef25ae7c7fae557be150f43fdd5f675 (patch) | |
| tree | 0344c4f6f08315b88c0efa1ce3ed502dc55be4c2 /wifi/java | |
| parent | c9be9f4d5bcf513654dbca24e648312d61e04bfc (diff) | |
| parent | 20903b392b78e5f3dc0ce8b782154adc77853468 (diff) | |
| download | frameworks_base-a3b9a2240ef25ae7c7fae557be150f43fdd5f675.zip frameworks_base-a3b9a2240ef25ae7c7fae557be150f43fdd5f675.tar.gz frameworks_base-a3b9a2240ef25ae7c7fae557be150f43fdd5f675.tar.bz2 | |
Merge "fix null pointer crash" into mnc-dev
Diffstat (limited to 'wifi/java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 85de1bf..a2b1858 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; |