bug 888268 - wifi tickler for mitigating 802.11 psp mode on android r=dougt
This commit is contained in:
@@ -1858,13 +1858,13 @@ AndroidBridge::GetCurrentNetworkInformation(hal::NetworkInformation* aNetworkInf
|
||||
AutoLocalJNIFrame jniFrame(env);
|
||||
|
||||
// To prevent calling too many methods through JNI, the Java method returns
|
||||
// an array of double even if we actually want a double and a boolean.
|
||||
// an array of double even if we actually want a double, two booleans, and an integer.
|
||||
jobject obj = env->CallStaticObjectMethod(mGeckoAppShellClass, jGetCurrentNetworkInformation);
|
||||
if (jniFrame.CheckForException())
|
||||
return;
|
||||
|
||||
jdoubleArray arr = static_cast<jdoubleArray>(obj);
|
||||
if (!arr || env->GetArrayLength(arr) != 2) {
|
||||
if (!arr || env->GetArrayLength(arr) != 4) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1872,6 +1872,8 @@ AndroidBridge::GetCurrentNetworkInformation(hal::NetworkInformation* aNetworkInf
|
||||
|
||||
aNetworkInfo->bandwidth() = info[0];
|
||||
aNetworkInfo->canBeMetered() = info[1] == 1.0f;
|
||||
aNetworkInfo->isWifi() = info[2] == 1.0f;
|
||||
aNetworkInfo->dhcpGateway() = info[3];
|
||||
|
||||
env->ReleaseDoubleArrayElements(arr, info, 0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user