diff --git a/b2g/chrome/content/settings.js b/b2g/chrome/content/settings.js
index 746b29fde63e..038f73b3d92a 100644
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -537,6 +537,48 @@ SettingsListener.observe("theme.selected",
setPAC();
})();
+#ifdef MOZ_B2G_RIL
+XPCOMUtils.defineLazyModuleGetter(this, "AppsUtils",
+ "resource://gre/modules/AppsUtils.jsm");
+
+// ======================= Dogfooders FOTA ==========================
+SettingsListener.observe('debug.performance_data.dogfooding', false,
+ isDogfooder => {
+ if (!isDogfooder) {
+ dump('AUS:Settings: Not a dogfooder!\n');
+ return;
+ }
+
+ if (!('mozTelephony' in navigator)) {
+ dump('AUS:Settings: There is no mozTelephony!\n');
+ return;
+ }
+
+ if (!('mozMobileConnections' in navigator)) {
+ dump('AUS:Settings: There is no mozMobileConnections!\n');
+ return;
+ }
+
+ let conn = navigator.mozMobileConnections[0];
+ conn.addEventListener('radiostatechange', function onradiostatechange() {
+ if (conn.radioState !== 'enabled') {
+ return;
+ }
+
+ conn.removeEventListener('radiostatechange', onradiostatechange);
+ navigator.mozTelephony.dial('*#06#').then(call => {
+ return call.result.then(res => {
+ if (res.success && res.statusMessage
+ && (res.serviceCode === 'scImei')) {
+ Services.prefs.setCharPref("app.update.imei_hash",
+ AppsUtils.computeHash(res.statusMessage, "SHA512"));
+ }
+ });
+ });
+ });
+ });
+#endif
+
// =================== Various simple mapping ======================
var settingsToObserve = {
'accessibility.screenreader_quicknav_modes': {
diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 1ffdf1650434..686fb3c8446d 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,11 +15,11 @@
-
+
-
+
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index 9379420fe47a..7885aefffcb9 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,11 +15,11 @@
-
+
-
+
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 827501b0c4fc..4c9e3ec86dd9 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,12 +19,12 @@
-
+
-
+
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 892fc6fd80dd..4f750f723152 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,9 +17,9 @@
-
+
-
+
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index fa095dff005b..b4d110c0b4bb 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,11 +15,11 @@
-
+
-
+
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 92fe63b5bc98..6c3790092575 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,11 +15,11 @@
-
+
-
+
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 827501b0c4fc..4c9e3ec86dd9 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,12 +19,12 @@
-
+
-
+
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 84eb0cf9907e..0096068244ad 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,11 +15,11 @@
-
+
-
+
diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 0a7b39fde9da..3358a73f9405 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
{
"git": {
- "git_revision": "aede8622d780ec71f766a3ecccbff74c04aaba4e",
+ "git_revision": "2082894c8e974b0c371e4dec298e0ad0f3ac56b1",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
- "revision": "dbd3a4ea9042cae987147f2d05f41d2a7ebaccbc",
+ "revision": "0e712c8d330e10908f99194a9638e62a07c5c483",
"repo_path": "integration/gaia-central"
}
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 185a7dd18c71..eefc6b17bd65 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,9 +17,9 @@
-
+
-
+
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 57c4df19634c..9b5668ab3b13 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,11 +15,11 @@
-
+
-
+
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 4cf542d9bc7b..d8c045917bd9 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -163,7 +163,7 @@
diff --git a/browser/base/content/test/general/browser_selectpopup.js b/browser/base/content/test/general/browser_selectpopup.js
index 6e043d9139d6..af5daf453ae4 100644
--- a/browser/base/content/test/general/browser_selectpopup.js
+++ b/browser/base/content/test/general/browser_selectpopup.js
@@ -23,7 +23,7 @@ const PAGECONTENT =
" " +
+ " Text" +
"