diff options
| author | Mitchell Wills <mwills@google.com> | 2016-06-09 19:13:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-09 19:13:36 +0000 |
| commit | 83681ce58e32ab802ce46e8f1999a90e035a61d4 (patch) | |
| tree | 248481c4397abd7279328f6b2d9dd91ba64ba73b /service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java | |
| parent | 373093ae826a68f0dd902309678c230ab3e078cd (diff) | |
| parent | 49872c10dc0a5ff54b47ca6af4a01a7d7d51724b (diff) | |
| download | android_frameworks_opt_net_wifi-83681ce58e32ab802ce46e8f1999a90e035a61d4.tar.gz android_frameworks_opt_net_wifi-83681ce58e32ab802ce46e8f1999a90e035a61d4.tar.bz2 android_frameworks_opt_net_wifi-83681ce58e32ab802ce46e8f1999a90e035a61d4.zip | |
Fix crashes in significant change when wifi hasn\\\'t started am: 11bb0926a6 am: f1f88eebd8
am: 49872c10dc
Change-Id: I118db5b04233a512ba43349dfa1d9da3536fc37e
Diffstat (limited to 'service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java')
| -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 e9da431d3..95bdce831 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) { |