Bug 799825 - [wifi] Unable to connect to WPA Network. r=mrbkap

This commit is contained in:
Vincent Chang 2012-11-02 11:18:11 +08:00
parent c5d3b5faaa
commit 9d0ce97a7d

View File

@ -40,14 +40,13 @@ XPCOMUtils.defineLazyServiceGetter(this, "gSettingsService",
// command always succeeds and we do a string/boolean check for the // command always succeeds and we do a string/boolean check for the
// expected results). // expected results).
var WifiManager = (function() { var WifiManager = (function() {
function getSdkVersionAndDevice() { function getSdkVersion() {
Cu.import("resource://gre/modules/systemlibs.js"); Cu.import("resource://gre/modules/systemlibs.js");
let sdkVersion = libcutils.property_get("ro.build.version.sdk"); let sdkVersion = libcutils.property_get("ro.build.version.sdk");
return { sdkVersion: parseInt(sdkVersion, 10), return parseInt(sdkVersion, 10);
device: libcutils.property_get("ro.product.device") };
} }
let { sdkVersion, device } = getSdkVersionAndDevice(); let sdkVersion = getSdkVersion();
var controlWorker = new ChromeWorker(WIFIWORKER_WORKER); var controlWorker = new ChromeWorker(WIFIWORKER_WORKER);
var eventWorker = new ChromeWorker(WIFIWORKER_WORKER); var eventWorker = new ChromeWorker(WIFIWORKER_WORKER);
@ -720,7 +719,7 @@ var WifiManager = (function() {
} }
manager.start = function() { manager.start = function() {
debug("detected SDK version " + sdkVersion + " and device " + device); debug("detected SDK version " + sdkVersion);
connectToSupplicant(connectCallback); connectToSupplicant(connectCallback);
} }