diff options
| author | vandwalle <vandwalle@google.com> | 2014-11-13 11:48:29 -0800 |
|---|---|---|
| committer | vandwalle <vandwalle@google.com> | 2014-11-13 11:48:29 -0800 |
| commit | 12ecdb7b85152b47a5469f0942f3e9d811d6d90b (patch) | |
| tree | 17b1aeb8c8669b9f8da56911b5b59d737205e253 /service/java/com | |
| parent | 005c1ef113192f898499a407dd266393a8d6b076 (diff) | |
| download | android_frameworks_opt_net_wifi-12ecdb7b85152b47a5469f0942f3e9d811d6d90b.tar.gz android_frameworks_opt_net_wifi-12ecdb7b85152b47a5469f0942f3e9d811d6d90b.tar.bz2 android_frameworks_opt_net_wifi-12ecdb7b85152b47a5469f0942f3e9d811d6d90b.zip | |
check for null pointers when processing CMD_START_SCAN
Change-Id: Icc3bcb37d181e6f28673808d5c3239d18c6a482f
Diffstat (limited to 'service/java/com')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 25d954085..52aaebc7a 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -1789,10 +1789,16 @@ public class WifiStateMachine extends StateMachine { } private void handleScanRequest(int type, Message message) { + ScanSettings settings = null; + WorkSource workSource = null; + // unbundle parameters Bundle bundle = (Bundle) message.obj; - ScanSettings settings = bundle.getParcelable(CUSTOMIZED_SCAN_SETTING); - WorkSource workSource = bundle.getParcelable(CUSTOMIZED_SCAN_WORKSOURCE); + + if (bundle != null) { + settings = bundle.getParcelable(CUSTOMIZED_SCAN_SETTING); + workSource = bundle.getParcelable(CUSTOMIZED_SCAN_WORKSOURCE); + } // parse scan settings String freqs = null; |