diff options
| author | Pierre Vandwalle <vandwalle@google.com> | 2015-05-08 16:07:04 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-05-13 19:16:09 -0700 |
| commit | 20903b392b78e5f3dc0ce8b782154adc77853468 (patch) | |
| tree | 53c24d3aeb9c7049173fddd9de632e9110ed5e9e /wifi/java | |
| parent | aef477a65e9baaf1feb2c60350f1faf0132d8e92 (diff) | |
| download | frameworks_base-20903b392b78e5f3dc0ce8b782154adc77853468.zip frameworks_base-20903b392b78e5f3dc0ce8b782154adc77853468.tar.gz frameworks_base-20903b392b78e5f3dc0ce8b782154adc77853468.tar.bz2 | |
fix null pointer crash
(cherry-picked from mirror-m-wireless-internal-release
216d8c3 fix null pointer crash)
Bug: 20232584
Change-Id: I7c46e372bc8f3a54b0428ef56c034eb2c79133ea
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 5e99672..030a5d5 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; |