Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1446809 - Remove some b2g leftover in devtools/shared/system.js r=jdescottes

Browse Source 
MozReview-Commit-ID: 1YlBPwjyWO2

--HG--
extra : rebase_source : fac6339de325bbdbc7f243cbe82fe3fe8d49a69b
extra : source : 42146f3856d007bba68045f84a44090efed3c498
This commit is contained in:
Sylvestre Ledru 2018-03-19 10:45:29 +01:00
parent 67f287235a
commit 26df3a2563
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
devtools/shared/system.js
View File

@ -39,7 +39,6 @@ const APP_MAP = {
"{3550f703-e582-4d05-9a08-453d09bdfdc6}": "thunderbird",
"{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}": "seamonkey",
"{718e30fb-e89b-41dd-9da7-e25a45638b28}": "sunbird",
"{3c2e2abc-06d4-11e1-ac3b-374f68613e61}": "b2g",
"{aa3c5121-dab2-40e2-81ca-7ea25febc110}": "mobile/android"
};
@ -67,22 +66,8 @@ async function getSystemInfo() {
let hardware = "unknown";
let version = "unknown";
// B2G specific
if (apptype === "b2g") {
os = "B2G";
// `getSetting` does not work in child processes on b2g.
// TODO bug 1205797, make this work in child processes.
try {
hardware = await exports.getSetting("deviceinfo.hardware");
version = await exports.getSetting("deviceinfo.os");
} catch (e) {
// Ignore.
}
} else {
// Not B2G
os = appInfo.OS;
version = appInfo.version;
}
os = appInfo.OS;
version = appInfo.version;
let bundle = Services.strings.createBundle("chrome://branding/locale/brand.properties");
if (bundle) {
@ -124,7 +109,6 @@ async function getSystemInfo() {
// The application's version, for example "0.8.0+" or "3.7a1pre".
// Typically, the version of Firefox, for example.
// It is different than the version of Gecko or the XULRunner platform.
// On B2G, this is the Gaia version.
version,
// The application's build ID/date, for example "2004051604".
@ -155,7 +139,6 @@ async function getSystemInfo() {
// Name of the OS type. Typically the same as `uname -s`. Possible values:
// https://developer.mozilla.org/en/OS_TARGET
// Also may be "B2G".
os,
platform: os,
@ -270,7 +253,6 @@ function getSetting(name) {
if ("@mozilla.org/settingsService;1" in Cc) {
let settingsService;
// settingsService fails in b2g child processes
// TODO bug 1205797, make this work in child processes.
try {
settingsService = Cc["@mozilla.org/settingsService;1"]