diff options
author | Mitchell Wills <mwills@google.com> | 2016-06-09 09:39:25 -0700 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2016-06-10 15:38:19 -0700 |
commit | 5689906d7e9a068851193191b942af7083e21dbe (patch) | |
tree | cc136b6aacde030524fbc28fcdb802a50799831d | |
parent | f5bbfb7e0c05365603ff5661d8745f3369dc9ddc (diff) | |
download | android_frameworks_opt_net_wifi-5689906d7e9a068851193191b942af7083e21dbe.tar.gz android_frameworks_opt_net_wifi-5689906d7e9a068851193191b942af7083e21dbe.tar.bz2 android_frameworks_opt_net_wifi-5689906d7e9a068851193191b942af7083e21dbe.zip |
Fix crashes in significant change when wifi hasn't started
The SignificantChange state machine doesn't actually have a concept of
if Wifi is on or not. This will simply ensure that it is not possible to
cause a crash.
Change-Id: I8ff87364bf7d5c87f0519b6cdc32d164facf30eb
Fixes: 29237535
-rw-r--r-- | service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java index a82ce1f25..5c085432a 100644 --- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java +++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java @@ -2373,12 +2373,16 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { } private void trackSignificantWifiChange(WifiScanner.WifiChangeSettings settings) { - mScannerImpl.untrackSignificantWifiChange(); - mScannerImpl.trackSignificantWifiChange(settings, this); + if (mScannerImpl != null) { + mScannerImpl.untrackSignificantWifiChange(); + mScannerImpl.trackSignificantWifiChange(settings, this); + } } private void untrackSignificantWifiChange() { - mScannerImpl.untrackSignificantWifiChange(); + if (mScannerImpl != null) { + mScannerImpl.untrackSignificantWifiChange(); + } } private void addWifiChangeHandler(ClientInfo ci, int handler) { |