mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge b2g-inbound to m-c

This commit is contained in:
Wes Kocher 2014-04-28 16:10:59 -07:00
Родитель ebf5e47361 3aa574f99a
Коммит f2ad22eb49
28 изменённых файлов: 164 добавлений и 23 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
b2g/config/emulator-ics/sources.xml
Просмотреть файл

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cadddcac2b8ce162a5e27e6dc105557b00a94478"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="725a23802708eb70e3d7e8a2ce7179adbac806e4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="0292e64ef8451df104dcf9ac3b2c6749b81684dd"/>

4
b2g/config/emulator-jb/sources.xml
Просмотреть файл

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="cadddcac2b8ce162a5e27e6dc105557b00a94478"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="725a23802708eb70e3d7e8a2ce7179adbac806e4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e"/>
@ -131,6 +131,6 @@
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="07f695559cf1834e908fce0ec2a8531582369bac"/>
<project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="0e56e450367cd802241b27164a2979188242b95f"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="bc70af75eac79073c4c935bf1f71c0cb10e821b7"/>
<project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="baaf899afb158b9530690002f3656e958e3eb047"/>
<project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="83e1560bef0988bbdec49d15cb8eef402857d4ef"/>
<project name="android-sdk" path="sdk" remote="b2g" revision="8b1365af38c9a653df97349ee53a3f5d64fd590a"/>
</manifest>

2
b2g/config/emulator-kk/sources.xml
Просмотреть файл

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="65fba428f8d76336b33ddd9e15900357953600ba">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="cadddcac2b8ce162a5e27e6dc105557b00a94478"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="725a23802708eb70e3d7e8a2ce7179adbac806e4"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>

2
b2g/config/emulator/sources.xml
Просмотреть файл

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cadddcac2b8ce162a5e27e6dc105557b00a94478"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="725a23802708eb70e3d7e8a2ce7179adbac806e4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="0292e64ef8451df104dcf9ac3b2c6749b81684dd"/>

2
b2g/config/flame/sources.xml
Просмотреть файл

@ -18,7 +18,7 @@
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="cadddcac2b8ce162a5e27e6dc105557b00a94478"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="725a23802708eb70e3d7e8a2ce7179adbac806e4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e"/>

2
b2g/config/gaia.json
Просмотреть файл

@ -4,6 +4,6 @@
"remote": "",
"branch": ""
},
"revision": "dd1090309fea415972091d81b2c5fe5420759eeb",
"revision": "e151404830232e385c41d5fce72277c0e719419a",
"repo_path": "/integration/gaia-central"
}

2
b2g/config/hamachi/sources.xml
Просмотреть файл

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cadddcac2b8ce162a5e27e6dc105557b00a94478"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="725a23802708eb70e3d7e8a2ce7179adbac806e4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

2
b2g/config/helix/sources.xml
Просмотреть файл

@ -15,7 +15,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cadddcac2b8ce162a5e27e6dc105557b00a94478"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="725a23802708eb70e3d7e8a2ce7179adbac806e4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

2
b2g/config/inari/sources.xml
Просмотреть файл

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cadddcac2b8ce162a5e27e6dc105557b00a94478"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="725a23802708eb70e3d7e8a2ce7179adbac806e4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

2
b2g/config/leo/sources.xml
Просмотреть файл

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cadddcac2b8ce162a5e27e6dc105557b00a94478"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="725a23802708eb70e3d7e8a2ce7179adbac806e4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

4
b2g/config/mako/sources.xml
Просмотреть файл

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="cadddcac2b8ce162a5e27e6dc105557b00a94478"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="725a23802708eb70e3d7e8a2ce7179adbac806e4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d6c36d74ba9aefbc8c3618fc93dd4907a0dbf5e"/>
@ -127,7 +127,7 @@
<project name="device-mako" path="device/lge/mako" remote="b2g" revision="78d17f0c117f0c66dd55ee8d5c5dde8ccc93ecba"/>
<project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="3a9a17613cc685aa232432566ad6cc607eab4ec1"/>
<project name="device/lge/mako-kernel" path="device/lge/mako-kernel" revision="d1729e53d71d711c8fde25eab8728ff2b9b4df0e"/>
<project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="baaf899afb158b9530690002f3656e958e3eb047"/>
<project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="83e1560bef0988bbdec49d15cb8eef402857d4ef"/>
<project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="7d33aaf740bbf6c7c6e9c34a92b371eda311b66b"/>
<project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="0e56e450367cd802241b27164a2979188242b95f"/>
<project name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" revision="0e1929fa3aa38bf9d40e9e953d619fab8164c82e"/>

2
b2g/config/wasabi/sources.xml
Просмотреть файл

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="cadddcac2b8ce162a5e27e6dc105557b00a94478"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="725a23802708eb70e3d7e8a2ce7179adbac806e4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2f28398184d20480254ca275a441a1c79a1a9d8c"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

1
content/base/src/nsGkAtomList.h
Просмотреть файл

@ -676,6 +676,7 @@ GK_ATOM(onchargingchange, "onchargingchange")
GK_ATOM(onchargingtimechange, "onchargingtimechange")
GK_ATOM(onchecking, "onchecking")
GK_ATOM(onclick, "onclick")
GK_ATOM(onclirmodechange, "onclirmodechange")
GK_ATOM(onclose, "onclose")
GK_ATOM(oncommand, "oncommand")
GK_ATOM(oncommandupdate, "oncommandupdate")

6
dom/bluetooth/BluetoothRilListener.cpp
Просмотреть файл

@ -148,6 +148,12 @@ MobileConnectionListener::NotifyRadioStateChanged()
return NS_OK;
}
NS_IMETHODIMP
MobileConnectionListener::NotifyClirModeChanged(uint32_t aMode)
{
return NS_OK;
}
bool
MobileConnectionListener::Listen(bool aStart)
{

4
dom/events/test/test_all_synthetic_events.html
Просмотреть файл

@ -229,6 +229,10 @@ const kEventConstructors = {
return new MozCellBroadcastEvent(aName, aProps);
},
},
MozClirModeEvent: { create: function (aName, aProps) {
return new MozClirModeEvent(aName, aProps);
},
},
MozContactChangeEvent: { create: function (aName, aProps) {
return new MozContactChangeEvent(aName, aProps);
},

8
dom/mobileconnection/interfaces/nsIDOMMobileConnection.idl
Просмотреть файл

@ -12,7 +12,7 @@ interface nsIDOMMozMobileCellInfo;
interface nsIDOMMozMobileCFInfo;
interface nsIVariant;
[scriptable, builtinclass, uuid(389ad352-4e43-4c1a-85e9-bae745554326)]
[scriptable, builtinclass, uuid(e891c732-216b-40b2-bda5-5a9d62e08779)]
interface nsIDOMMozMobileConnection : nsIDOMEventTarget
{
const long ICC_SERVICE_CLASS_VOICE = (1 << 0);
@ -471,6 +471,12 @@ interface nsIDOMMozMobileConnection : nsIDOMEventTarget
* changes.
*/
[implicit_jscontext] attribute jsval onradiostatechange;
/**
* The 'onclirmodechange' event is notified whenever the mode of the calling
* line id restriction (CLIR) changes.
*/
[implicit_jscontext] attribute jsval onclirmodechange;
};
[scriptable, uuid(49706beb-a160-40b7-b745-50f62e389a2c)]

3
dom/mobileconnection/interfaces/nsIMobileConnectionProvider.idl
Просмотреть файл

@ -11,7 +11,7 @@ interface nsIDOMMozMobileNetworkInfo;
interface nsIDOMWindow;
interface nsIVariant;
[scriptable, uuid(5013f5cc-24f9-45dc-ba03-f5dc031a3a6b)]
[scriptable, uuid(64eb8c1a-34b6-4ff8-ba47-23a5f9bea68c)]
interface nsIMobileConnectionListener : nsISupports
{
void notifyVoiceChanged();
@ -30,6 +30,7 @@ interface nsIMobileConnectionListener : nsISupports
void notifyOtaStatusChanged(in DOMString status);
void notifyIccChanged();
void notifyRadioStateChanged();
void notifyClirModeChanged(in unsigned long mode);
};
/**

20
dom/mobileconnection/src/MobileConnection.cpp
Просмотреть файл

@ -7,6 +7,7 @@
#include "GeneratedEvents.h"
#include "mozilla/dom/CFStateChangeEvent.h"
#include "mozilla/dom/DataErrorEvent.h"
#include "mozilla/dom/MozClirModeEvent.h"
#include "mozilla/dom/MozEmergencyCbModeEvent.h"
#include "mozilla/dom/MozOtaStatusEvent.h"
#include "mozilla/dom/USSDReceivedEvent.h"
@ -79,6 +80,7 @@ NS_IMPL_EVENT_HANDLER(MobileConnection, emergencycbmodechange)
NS_IMPL_EVENT_HANDLER(MobileConnection, otastatuschange)
NS_IMPL_EVENT_HANDLER(MobileConnection, iccchange)
NS_IMPL_EVENT_HANDLER(MobileConnection, radiostatechange)
NS_IMPL_EVENT_HANDLER(MobileConnection, clirmodechange)
MobileConnection::MobileConnection(uint32_t aClientId)
: mClientId(aClientId)
@ -733,3 +735,21 @@ MobileConnection::NotifyRadioStateChanged()
return DispatchTrustedEvent(NS_LITERAL_STRING("radiostatechange"));
}
NS_IMETHODIMP
MobileConnection::NotifyClirModeChanged(uint32_t aMode)
{
if (!CheckPermission("mobileconnection")) {
return NS_OK;
}
MozClirModeEventInit init;
init.mBubbles = false;
init.mCancelable = false;
init.mMode = aMode;
nsRefPtr<MozClirModeEvent> event =
MozClirModeEvent::Constructor(this, NS_LITERAL_STRING("clirmodechange"), init);
return DispatchTrustedEvent(event);
}

5
dom/nfc/tests/marionette/head.js
Просмотреть файл

@ -3,6 +3,10 @@
let pendingEmulatorCmdCount = 0;
let Promise =
SpecialPowers.Cu.import("resource://gre/modules/Promise.jsm").Promise;
let nfc = window.navigator.mozNfc;
SpecialPowers.addPermission("nfc-manager", true, document);
/**
@ -35,7 +39,6 @@ let emulator = (function() {
function toggleNFC(enabled, callback) {
isnot(callback, null);
let nfc = window.navigator.mozNfc;
let req;
if (enabled) {
req = nfc.startPoll();

1
dom/nfc/tests/marionette/manifest.ini
Просмотреть файл

@ -6,3 +6,4 @@ qemu=true
[test_ndef.js]
[test_nfc_enabled.js]
[test_nfc_manager_tech_discovered.js]
[test_nfc_peer.js]

1
dom/nfc/tests/marionette/test_nfc_enabled.js
Просмотреть файл

@ -4,7 +4,6 @@
MARIONETTE_TIMEOUT = 30000;
MARIONETTE_HEAD_JS = 'head.js';
let nfc = window.navigator.mozNfc;
function testEnableNFC() {
log('Running \'testEnableNFC\'');
let req = nfc.startPoll();

5
dom/nfc/tests/marionette/test_nfc_manager_tech_discovered.js
Просмотреть файл

@ -4,9 +4,6 @@
MARIONETTE_TIMEOUT = 30000;
MARIONETTE_HEAD_JS = 'head.js';
let Promise =
SpecialPowers.Cu.import("resource://gre/modules/Promise.jsm").Promise;
// See nfc-nci.h.
const NCI_LAST_NOTIFICATION = 0;
const NCI_LIMIT_NOTIFICATION = 1;
@ -24,7 +21,7 @@ function activateRE(re) {
let cmd = 'nfc ntf rf_intf_activated ' + re;
emulator.run(cmd, function(result) {
is(result.pop(), 'OK', 'check activation of RE0');
is(result.pop(), 'OK', 'check activation of RE' + re);
deferred.resolve();
});

64
dom/nfc/tests/marionette/test_nfc_peer.js Normal file
Просмотреть файл

@ -0,0 +1,64 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
MARIONETTE_TIMEOUT = 30000;
MARIONETTE_HEAD_JS = 'head.js';
let MANIFEST_URL = "app://system.gaiamobile.org/manifest.webapp";
function peerReadyCb(evt) {
log("peerReadyCb called");
let peer = nfc.getNFCPeer(evt.detail);
ok(peer instanceof MozNFCPeer, "Should get a NFCPeer object.");
// reset callback and NFC Hardware.
nfc.onpeerready = null;
toggleNFC(false, runNextTest);
}
function handleTechnologyDiscoveredRE0(msg) {
log("Received \'nfc-manager-tech-discovered\'");
is(msg.type, "techDiscovered", "check for correct message type");
is(msg.techList[0], "P2P", "check for correct tech type");
nfc.onpeerready = peerReadyCb;
let request = nfc.checkP2PRegistration(MANIFEST_URL);
request.onsuccess = function (evt) {
nfc.notifyUserAcceptedP2P(MANIFEST_URL);
}
request.onerror = function () {
ok(false, "checkP2PRegistration failed.");
toggleNFC(false, runNextTest);
}
}
function activateRE(re) {
let deferred = Promise.defer();
let cmd = "nfc ntf rf_intf_activated " + re;
emulator.run(cmd, function(result) {
is(result.pop(), "OK", "check activation of RE" + re);
deferred.resolve();
});
return deferred.promise;
}
function testPeerReady() {
window.navigator.mozSetMessageHandler(
"nfc-manager-tech-discovered", handleTechnologyDiscoveredRE0);
toggleNFC(true, function() {
activateRE(0);
});
}
let tests = [
testPeerReady
];
SpecialPowers.pushPermissions(
[{"type": "nfc-manager", "allow": true, context: document},
{"type": "nfc-write", "allow": true, context: document}], runTests);

9
dom/system/gonk/RILContentHelper.js
Просмотреть файл

@ -108,7 +108,8 @@ const RIL_IPC_MSG_NAMES = [
"RIL:SetVoicePrivacyMode",
"RIL:GetVoicePrivacyMode",
"RIL:OtaStatusChanged",
"RIL:MatchMvno"
"RIL:MatchMvno",
"RIL:ClirModeChanged"
];
XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
@ -1891,6 +1892,12 @@ RILContentHelper.prototype = {
this.handleSimpleRequest(data.requestId, data.errorMsg,
data.enabled);
break;
case "RIL:ClirModeChanged":
this._deliverEvent(clientId,
"_mobileConnectionListeners",
"notifyClirModeChanged",
[data]);
break;
}
},

7
dom/system/gonk/RadioInterfaceLayer.js
Просмотреть файл

@ -3489,6 +3489,11 @@ RadioInterface.prototype = {
this.clientId, message);
},
_sendClirModeChanged: function(message) {
gMessageManager.sendMobileConnectionMessage("RIL:ClirModeChanged",
this.clientId, message);
},
_updateCallingLineIdRestrictionPref: function(mode) {
try {
Services.prefs.setIntPref(kPrefClirModePreference, mode);
@ -3505,6 +3510,7 @@ RadioInterface.prototype = {
if (response.isSetCallForward) {
this._sendCfStateChanged(response);
} else if (response.isSetCLIR && response.success) {
this._sendClirModeChanged(response.clirMode);
this._updateCallingLineIdRestrictionPref(response.clirMode);
}
@ -3535,6 +3541,7 @@ RadioInterface.prototype = {
}
this.workerMessenger.send("setCLIR", message, (function(response) {
if (response.success) {
this._sendClirModeChanged(response.clirMode);
this._updateCallingLineIdRestrictionPref(response.clirMode);
}
target.sendAsyncMessage("RIL:SetCallingLineIdRestriction", {

2
dom/tests/mochitest/general/test_interfaces.html
Просмотреть файл

@ -619,6 +619,8 @@ var interfaceNamesInGlobalScope =
{name: "MozCellBroadcast", b2g: true, pref: "dom.cellbroadcast.enabled"},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "MozCellBroadcastEvent", b2g: true, pref: "dom.cellbroadcast.enabled"},
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "MozClirModeEvent", b2g: true, pref: "dom.mobileconnection.enabled"},
// IMPORTANT: Do not change this list without review from a DOM peer!
"mozContact",
// IMPORTANT: Do not change this list without review from a DOM peer!

22
dom/webidl/MozClirModeEvent.webidl Normal file
Просмотреть файл

@ -0,0 +1,22 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/.
*/
[Pref="dom.mobileconnection.enabled",
Constructor(DOMString type, optional MozClirModeEventInit eventInitDict)]
interface MozClirModeEvent : Event
{
/**
* Indicates the mode of the calling line id restriction (CLIR).
*
* @see nsIDOMMozMobileConnection.CLIR_* values.
*/
readonly attribute unsigned long mode;
};
dictionary MozClirModeEventInit : EventInit
{
unsigned long mode = 0;
};

1
dom/webidl/moz.build
Просмотреть файл

@ -600,6 +600,7 @@ GENERATED_EVENTS_WEBIDL_FILES = [
'ErrorEvent.webidl',
'IccChangeEvent.webidl',
'MediaStreamEvent.webidl',
'MozClirModeEvent.webidl',
'MozContactChangeEvent.webidl',
'MozEmergencyCbModeEvent.webidl',
'MozInterAppMessageEvent.webidl',