Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-18 23:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 944250 - Remove RILQUIRKS_MODEM_DEFAULTS_TO_EMERGENCY_MODE and correct marionette tests. r=hsinyi

Browse Source
This commit is contained in:
Edgar Chen 2013-11-28 15:21:02 +08:00
parent 836d47a4d0
commit c6fa2f00ea
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/network/tests/marionette/test_mobile_voice_state.js
View File

@ -94,7 +94,7 @@ function testUnregistered() {
is(connection.voice.connected, false);
is(connection.voice.state, "notSearching");
is(connection.voice.emergencyCallsOnly, false);
is(connection.voice.emergencyCallsOnly, true);
is(connection.voice.roaming, false);
is(connection.voice.cell, null);
is(connection.voice.signalStrength, null);
@ -112,7 +112,7 @@ function testSearching() {
is(connection.voice.connected, false);
is(connection.voice.state, "searching");
is(connection.voice.emergencyCallsOnly, false);
is(connection.voice.emergencyCallsOnly, true);
is(connection.voice.roaming, false);
is(connection.voice.cell, null);
is(connection.voice.signalStrength, null);
@ -130,7 +130,7 @@ function testDenied() {
is(connection.voice.connected, false);
is(connection.voice.state, "denied");
is(connection.voice.emergencyCallsOnly, false);
is(connection.voice.emergencyCallsOnly, true);
is(connection.voice.roaming, false);
is(connection.voice.cell, null);
is(connection.voice.signalStrength, null);

8
dom/system/gonk/ril_worker.js
View File

@ -79,7 +79,6 @@ let RILQUIRKS_CALLSTATE_EXTRA_UINT32 = libcutils.property_get("ro.moz.ril.callst
// number via the UNSOLICITED_RIL_CONNECTED parcel.
let RILQUIRKS_V5_LEGACY = libcutils.property_get("ro.moz.ril.v5_legacy", "true") === "true";
let RILQUIRKS_REQUEST_USE_DIAL_EMERGENCY_CALL = libcutils.property_get("ro.moz.ril.dial_emergency_call", "false") === "true";
let RILQUIRKS_MODEM_DEFAULTS_TO_EMERGENCY_MODE = libcutils.property_get("ro.moz.ril.emergency_by_default", "false") === "true";
let RILQUIRKS_SIM_APP_STATE_EXTRA_FIELDS = libcutils.property_get("ro.moz.ril.simstate_extra_field", "false") === "true";
// Needed for call-waiting on Peak device
let RILQUIRKS_EXTRA_UINT32_2ND_CALL = libcutils.property_get("ro.moz.ril.extra_int_2nd_call", "false") == "true";
@ -3298,12 +3297,7 @@ let RIL = {
curState.connected = regState == NETWORK_CREG_STATE_REGISTERED_HOME ||
regState == NETWORK_CREG_STATE_REGISTERED_ROAMING;
curState.roaming = regState == NETWORK_CREG_STATE_REGISTERED_ROAMING;
curState.emergencyCallsOnly =
(regState >= NETWORK_CREG_STATE_NOT_SEARCHING_EMERGENCY_CALLS) &&
(regState <= NETWORK_CREG_STATE_UNKNOWN_EMERGENCY_CALLS);
if (RILQUIRKS_MODEM_DEFAULTS_TO_EMERGENCY_MODE) {
curState.emergencyCallsOnly = !curState.connected;
}
curState.emergencyCallsOnly = !curState.connected;
}
if (!curState.cell) {