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

Merge b2g-inbound to m-c. a=merge

This commit is contained in:
Ryan VanderMeulen 2015-02-17 13:53:59 -05:00
Родитель fafc282f1a 7c082ed7e3
Коммит 91f565978e
18 изменённых файлов: 156 добавлений и 105 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="cdaa0a4ac28c781709df8c318ed079e9e475503a">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ae02fbdeae77b2002cebe33c61aedeee4b9439fd"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="4f39e48b95fa00c8669b8707447542024bb55432"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

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="ae02fbdeae77b2002cebe33c61aedeee4b9439fd"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="4f39e48b95fa00c8669b8707447542024bb55432"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="eb1795a9002eb142ac58c8d68f8f4ba094af07ca"/>

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

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ae02fbdeae77b2002cebe33c61aedeee4b9439fd"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="4f39e48b95fa00c8669b8707447542024bb55432"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d0d11d190ccc50d7d66009bcc896ad4b42d3f0d"/>

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

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="cdaa0a4ac28c781709df8c318ed079e9e475503a">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ae02fbdeae77b2002cebe33c61aedeee4b9439fd"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="4f39e48b95fa00c8669b8707447542024bb55432"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

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="ae02fbdeae77b2002cebe33c61aedeee4b9439fd"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="4f39e48b95fa00c8669b8707447542024bb55432"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="eb1795a9002eb142ac58c8d68f8f4ba094af07ca"/>

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

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="cdaa0a4ac28c781709df8c318ed079e9e475503a">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ae02fbdeae77b2002cebe33c61aedeee4b9439fd"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="4f39e48b95fa00c8669b8707447542024bb55432"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

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

@ -17,7 +17,7 @@
</project>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ae02fbdeae77b2002cebe33c61aedeee4b9439fd"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="4f39e48b95fa00c8669b8707447542024bb55432"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d0d11d190ccc50d7d66009bcc896ad4b42d3f0d"/>

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

@ -1,9 +1,9 @@
{
"git": {
"git_revision": "ae02fbdeae77b2002cebe33c61aedeee4b9439fd",
"git_revision": "4f39e48b95fa00c8669b8707447542024bb55432",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
"revision": "62d026a98ea42f2b93de000e8d0d4f1254f86730",
"revision": "e0816d2581cdc2d0581f625c06811128c87c0c48",
"repo_path": "integration/gaia-central"
}

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

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ae02fbdeae77b2002cebe33c61aedeee4b9439fd"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="4f39e48b95fa00c8669b8707447542024bb55432"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="fe893bb760a3bb64375f62fdf4762a58c59df9ef"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="8d0d11d190ccc50d7d66009bcc896ad4b42d3f0d"/>

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

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="7f2ee9f4cb926684883fc2a2e407045fd9db2199">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="ae02fbdeae77b2002cebe33c61aedeee4b9439fd"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="4f39e48b95fa00c8669b8707447542024bb55432"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="2262d4a77d4f46ab230fd747bb91e9b77bad36cb"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>

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

@ -108,7 +108,7 @@ interface nsIMobileConnectionListener : nsISupports
#define NO_ADDITIONAL_INFORMATION 0
%}
[scriptable, builtinclass, uuid(14d66926-8434-11e4-8c3f-f724194bb5f1)]
[scriptable, uuid(14d66926-8434-11e4-8c3f-f724194bb5f1)]
interface nsIMobileConnectionCallback : nsISupports
{
/**

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

@ -130,16 +130,31 @@ this.REQUEST_ACKNOWLEDGE_INCOMING_GSM_SMS_WITH_PDU = 106;
this.REQUEST_STK_SEND_ENVELOPE_WITH_STATUS = 107;
this.REQUEST_VOICE_RADIO_TECH = 108;
this.REQUEST_GET_CELL_INFO_LIST = 109;
this.REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE = 110;
this.REQUEST_SET_INITIAL_ATTACH_APN = 111;
this.REQUEST_IMS_REGISTRATION_STATE = 112;
this.REQUEST_IMS_SEND_SMS = 113;
this.REQUEST_SIM_TRANSMIT_APDU_BASIC = 114;
this.REQUEST_SIM_OPEN_CHANNEL = 115;
this.REQUEST_SIM_CLOSE_CHANNEL = 116;
this.REQUEST_SIM_TRANSMIT_APDU_CHANNEL = 117;
this.REQUEST_NV_READ_ITEM = 118;
this.REQUEST_NV_WRITE_ITEM = 119;
this.REQUEST_NV_WRITE_CDMA_PRL = 120;
this.REQUEST_NV_RESET_CONFIG = 121;
this.REQUEST_SET_UICC_SUBSCRIPTION = 122;
this.REQUEST_ALLOW_DATA = 123;
this.REQUEST_GET_HARDWARE_CONFIG = 124;
this.REQUEST_SIM_AUTHENTICATION = 125;
this.REQUEST_GET_DC_RT_INFO = 126;
this.REQUEST_SET_DC_RT_INFO_RATE = 127;
this.REQUEST_SET_DATA_PROFILE = 128;
this.REQUEST_SHUTDOWN = 129;
// CAF specific parcel type. Synced with latest version.
// Please see https://www.codeaurora.org/cgit/quic/la/platform/hardware/ril/tree/include/telephony/ril.h?h=b2g_kk_3.5
this.REQUEST_SET_UICC_SUBSCRIPTION = 115;
this.REQUEST_SET_DATA_SUBSCRIPTION = 116;
// UICC Secure Access.
this.REQUEST_SIM_OPEN_CHANNEL = 121;
this.REQUEST_SIM_CLOSE_CHANNEL = 122;
this.REQUEST_SIM_ACCESS_CHANNEL = 123;
// CAF specific parcel type. It should be synced with latest version. But CAF
// doesn't have l version for b2g yet, so we set REQUEST_SET_DATA_SUBSCRIPTION
// to a value that won't get conflict with known AOSP parcel.
this.REQUEST_SET_DATA_SUBSCRIPTION = 130;
// Mozilla specific parcel type.
this.REQUEST_GET_UNLOCK_RETRY_COUNT = 150;
@ -191,6 +206,12 @@ this.UNSOLICITED_CDMA_PRL_CHANGED = 1032;
this.UNSOLICITED_EXIT_EMERGENCY_CALLBACK_MODE = 1033;
this.UNSOLICITED_RIL_CONNECTED = 1034;
this.UNSOLICITED_VOICE_RADIO_TECH_CHANGED = 1035;
this.UNSOLICITED_CELL_INFO_LIST = 1036;
this.UNSOLICITED_RESPONSE_IMS_NETWORK_STATE_CHANGED = 1037;
this.UNSOLICITED_UICC_SUBSCRIPTION_STATUS_CHANGED = 1038;
this.UNSOLICITED_SRVCC_STATE_NOTIFY = 1039;
this.UNSOLICITED_HARDWARE_CONFIG_CHANGED = 1040;
this.UNSOLICITED_DC_RT_INFO_CHANGED = 1041;
this.ERROR_SUCCESS = 0;
this.ERROR_RADIO_NOT_AVAILABLE = 1;

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

@ -1322,10 +1322,6 @@ RilObject.prototype = {
* Open Logical UICC channel (aid) for Secure Element access
*/
iccOpenChannel: function(options) {
if (DEBUG) {
this.context.debug("iccOpenChannel: " + JSON.stringify(options));
}
let Buf = this.context.Buf;
Buf.newParcel(REQUEST_SIM_OPEN_CHANNEL, options);
Buf.writeString(options.aid);
@ -1336,31 +1332,15 @@ RilObject.prototype = {
* Exchange APDU data on an open Logical UICC channel
*/
iccExchangeAPDU: function(options) {
if (DEBUG) this.context.debug("iccExchangeAPDU: " + JSON.stringify(options));
let cla = options.apdu.cla;
let command = options.apdu.command;
let channel = options.channel;
let path = options.apdu.path || "";
let data = options.apdu.data || "";
let data2 = options.apdu.data2 || "";
let p1 = options.apdu.p1;
let p2 = options.apdu.p2;
let p3 = options.apdu.p3; // Extra
let Buf = this.context.Buf;
Buf.newParcel(REQUEST_SIM_ACCESS_CHANNEL, options);
Buf.writeInt32(cla);
Buf.writeInt32(command);
Buf.writeInt32(channel);
Buf.writeString(path); // path
Buf.writeInt32(p1);
Buf.writeInt32(p2);
Buf.writeInt32(p3);
Buf.writeString(data); // generic data field.
Buf.writeString(data2);
Buf.newParcel(REQUEST_SIM_TRANSMIT_APDU_CHANNEL, options);
Buf.writeInt32(options.channel);
Buf.writeInt32(options.apdu.cla);
Buf.writeInt32(options.apdu.command);
Buf.writeInt32(options.apdu.p1);
Buf.writeInt32(options.apdu.p2);
Buf.writeInt32(options.apdu.p3);
Buf.writeString(options.apdu.data);
Buf.sendParcel();
},
@ -1368,8 +1348,6 @@ RilObject.prototype = {
* Close Logical UICC channel
*/
iccCloseChannel: function(options) {
if (DEBUG) this.context.debug("iccCloseChannel: " + JSON.stringify(options));
let Buf = this.context.Buf;
Buf.newParcel(REQUEST_SIM_CLOSE_CHANNEL, options);
Buf.writeInt32(1);
@ -5863,47 +5841,6 @@ RilObject.prototype[REQUEST_CHANGE_BARRING_PASSWORD] =
options.statusMessage = MMI_SM_KS_PASSWORD_CHANGED;
this.sendChromeMessage(options);
};
RilObject.prototype[REQUEST_SIM_OPEN_CHANNEL] = function REQUEST_SIM_OPEN_CHANNEL(length, options) {
if (options.rilRequestError) {
options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
this.sendChromeMessage(options);
return;
}
options.channel = this.context.Buf.readInt32();
if (DEBUG) {
this.context.debug("Setting channel number in options: " + options.channel);
}
this.sendChromeMessage(options);
};
RilObject.prototype[REQUEST_SIM_CLOSE_CHANNEL] = function REQUEST_SIM_CLOSE_CHANNEL(length, options) {
if (options.rilRequestError) {
options.error = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
this.sendChromeMessage(options);
return;
}
// No return value
this.sendChromeMessage(options);
};
RilObject.prototype[REQUEST_SIM_ACCESS_CHANNEL] = function REQUEST_SIM_ACCESS_CHANNEL(length, options) {
if (options.rilRequestError) {
options.error = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
this.sendChromeMessage(options);
}
let Buf = this.context.Buf;
options.sw1 = Buf.readInt32();
options.sw2 = Buf.readInt32();
options.simResponse = Buf.readString();
if (DEBUG) {
this.context.debug("Setting return values for RIL[REQUEST_SIM_ACCESS_CHANNEL]: [" +
options.sw1 + "," +
options.sw2 + ", " +
options.simResponse + "]");
}
this.sendChromeMessage(options);
};
RilObject.prototype[REQUEST_QUERY_NETWORK_SELECTION_MODE] = function REQUEST_QUERY_NETWORK_SELECTION_MODE(length, options) {
this._receivedNetworkInfo(NETWORK_INFO_NETWORK_SELECTION_MODE);
@ -6427,12 +6364,64 @@ RilObject.prototype[REQUEST_VOICE_RADIO_TECH] = function REQUEST_VOICE_RADIO_TEC
let radioTech = this.context.Buf.readInt32List();
this._processRadioTech(radioTech[0]);
};
RilObject.prototype[REQUEST_GET_CELL_INFO_LIST] = null;
RilObject.prototype[REQUEST_SET_UNSOL_CELL_INFO_LIST_RATE] = null;
RilObject.prototype[REQUEST_SET_INITIAL_ATTACH_APN] = null;
RilObject.prototype[REQUEST_IMS_REGISTRATION_STATE] = null;
RilObject.prototype[REQUEST_IMS_SEND_SMS] = null;
RilObject.prototype[REQUEST_SIM_TRANSMIT_APDU_BASIC] = null;
RilObject.prototype[REQUEST_SIM_OPEN_CHANNEL] = function REQUEST_SIM_OPEN_CHANNEL(length, options) {
if (options.rilRequestError) {
options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
this.sendChromeMessage(options);
return;
}
options.channel = this.context.Buf.readInt32();
if (DEBUG) {
this.context.debug("Setting channel number in options: " + options.channel);
}
this.sendChromeMessage(options);
};
RilObject.prototype[REQUEST_SIM_CLOSE_CHANNEL] = function REQUEST_SIM_CLOSE_CHANNEL(length, options) {
this.sendDefaultResponse(options);
};
RilObject.prototype[REQUEST_SIM_TRANSMIT_APDU_CHANNEL] = function REQUEST_SIM_TRANSMIT_APDU_CHANNEL(length, options) {
if (options.rilRequestError) {
options.errorMsg = RIL_ERROR_TO_GECKO_ERROR[options.rilRequestError];
this.sendChromeMessage(options);
return;
}
let Buf = this.context.Buf;
options.sw1 = Buf.readInt32();
options.sw2 = Buf.readInt32();
options.simResponse = Buf.readString();
if (DEBUG) {
this.context.debug("Setting return values for RIL[REQUEST_SIM_TRANSMIT_APDU_CHANNEL]: [" +
options.sw1 + "," +
options.sw2 + ", " +
options.simResponse + "]");
}
this.sendChromeMessage(options);
};
RilObject.prototype[REQUEST_NV_READ_ITEM] = null;
RilObject.prototype[REQUEST_NV_WRITE_ITEM] = null;
RilObject.prototype[REQUEST_NV_WRITE_CDMA_PRL] = null;
RilObject.prototype[REQUEST_NV_RESET_CONFIG] = null;
RilObject.prototype[REQUEST_SET_UICC_SUBSCRIPTION] = function REQUEST_SET_UICC_SUBSCRIPTION(length, options) {
// Resend data subscription after uicc subscription.
if (this._attachDataRegistration) {
this.setDataRegistration({attach: true});
}
};
RilObject.prototype[REQUEST_ALLOW_DATA] = null;
RilObject.prototype[REQUEST_GET_HARDWARE_CONFIG] = null;
RilObject.prototype[REQUEST_SIM_AUTHENTICATION] = null;
RilObject.prototype[REQUEST_GET_DC_RT_INFO] = null;
RilObject.prototype[REQUEST_SET_DC_RT_INFO_RATE] = null;
RilObject.prototype[REQUEST_SET_DATA_PROFILE] = null;
RilObject.prototype[REQUEST_SHUTDOWN] = null;
RilObject.prototype[REQUEST_SET_DATA_SUBSCRIPTION] = function REQUEST_SET_DATA_SUBSCRIPTION(length, options) {
if (!options.rilMessageType) {
// The request was made by ril_worker itself. Don't report.
@ -6827,6 +6816,12 @@ RilObject.prototype[UNSOLICITED_VOICE_RADIO_TECH_CHANGED] = function UNSOLICITED
// See Bug 866038.
this._processRadioTech(this.context.Buf.readInt32List()[0]);
};
RilObject.prototype[UNSOLICITED_CELL_INFO_LIST] = null;
RilObject.prototype[UNSOLICITED_RESPONSE_IMS_NETWORK_STATE_CHANGED] = null;
RilObject.prototype[UNSOLICITED_UICC_SUBSCRIPTION_STATUS_CHANGED] = null;
RilObject.prototype[UNSOLICITED_SRVCC_STATE_NOTIFY] = null;
RilObject.prototype[UNSOLICITED_HARDWARE_CONFIG_CHANGED] = null;
RilObject.prototype[UNSOLICITED_DC_RT_INFO_CHANGED] = null;
/**
* This object exposes the functionality to parse and serialize PDU strings

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

@ -29,6 +29,26 @@
// this derived one needs to invoke it.
// Using 'apply' style to mark it's a parent method calling explicitly.
Buf._init.apply(this);
// Remapping the request type to different values based on RIL version.
// We only have to do this for SUBSCRIPTION right now, so I just make it
// simple. A generic logic or structure could be discussed if we have more
// use cases, especially the cases from different partners.
this._requestMap = {};
// RIL version 8.
// For the CAF's proprietary parcels. Please see
// https://www.codeaurora.org/cgit/quic/la/platform/hardware/ril/tree/include/telephony/ril.h?h=b2g_jb_3.2
let map = {};
map[REQUEST_SET_UICC_SUBSCRIPTION] = 114;
map[REQUEST_SET_DATA_SUBSCRIPTION] = 115;
this._requestMap[8] = map;
// RIL version 9.
// For the CAF's proprietary parcels. Please see
// https://www.codeaurora.org/cgit/quic/la/platform/hardware/ril/tree/include/telephony/ril.h?h=b2g_kk_3.5
map = {};
map[REQUEST_SET_UICC_SUBSCRIPTION] = 115;
map[REQUEST_SET_DATA_SUBSCRIPTION] = 116;
this._requestMap[9] = map;
};
/**
@ -124,19 +144,18 @@
* use cases, especially the cases from different partners.
*/
BufObject.prototype._reMapRequestType = function(type) {
let newType = type;
switch (type) {
case REQUEST_SET_UICC_SUBSCRIPTION:
case REQUEST_SET_DATA_SUBSCRIPTION:
if (this.context.RIL.version < 9) {
// Shift the CAF's proprietary parcels. Please see
// https://www.codeaurora.org/cgit/quic/la/platform/hardware/ril/tree/include/telephony/ril.h?h=b2g_jb_3.2
newType = type - 1;
for (let version in this._requestMap) {
if (this.context.RIL.version <= version) {
let newType = this._requestMap[version][type];
if (newType) {
if (DEBUG) {
this.context.debug("Remap request type to " + newType);
}
break;
}
return newType;
}
}
}
return type;
};
// Before we make sure to form it as a module would not add extra

12
testing/taskcluster/tasks/branches/try/job_flags.yml
Просмотреть файл

@ -44,6 +44,18 @@ builds:
task: tasks/builds/b2g_emulator_ics_opt.yml
debug:
task: tasks/builds/b2g_emulator_ics_debug.yml
flame-kk:
platforms:
- b2g
types:
opt:
task: tasks/builds/b2g_flame_kk_opt.yml
flame-kk-eng:
platforms:
- b2g
types:
opt:
task: tasks/builds/b2g_flame_kk_eng.yml
tests:
cppunit:

2
testing/taskcluster/tasks/builds/b2g_flame_kk_eng.yml
Просмотреть файл

@ -1,7 +1,7 @@
$inherits:
from: 'tasks/builds/b2g_phone_base.yml'
task:
workerType: b2gbuild-emulator-kk
workerType: flame-kk
scopes:
- 'docker-worker:cache:build-flame-kk-eng'
metadata:

2
testing/taskcluster/tasks/builds/b2g_flame_kk_opt.yml
Просмотреть файл

@ -1,7 +1,7 @@
$inherits:
from: 'tasks/builds/b2g_phone_base.yml'
task:
workerType: b2gbuild-emulator-kk
workerType: flame-kk
scopes:
- 'docker-worker:cache:build-flame-kk-opt'
metadata:

4
testing/taskcluster/tasks/phone_build.yml
Просмотреть файл

@ -9,11 +9,13 @@ task:
metadata:
source: http://todo.com/soon
owner: mozilla-taskcluster-maintenance@mozilla.com
tags:
createdForUser: {{owner}}
workerType: b2gbuild
provisionerId: aws-provisioner
schedulerId: task-graph-scheduler
scopes:
# Nearly all of our build tasks use tc-vcs so just include the scope across
@ -49,4 +51,6 @@ task:
extra:
treeherder:
groupSymbol: tc
groupName: Submitted by taskcluster
symbol: B