diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 9f9a6391bb4f..ff1206a7afca 100644
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml
index b5452a3b9f03..3bb72cf995e2 100644
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml
index 53194b9e19ca..c7b7ab694688 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 1c6c519db687..9126978cedfc 100644
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml
index b639a383e8b0..5647782a0cc2 100644
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml
index 02b0b922ee56..1f01e0dafdd3 100644
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml
index 53194b9e19ca..c7b7ab694688 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 8b21180e3b52..ee3cca6b0897 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index ea0e5c4a505b..999a36c90aa4 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
{
"git": {
- "git_revision": "5bcc08a732163087999251b523e3643db397412c",
+ "git_revision": "7cd4130d4f988562a77d126860408ada65bb95ef",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
- "revision": "66ad152ea50938f799bf7edd4bc2088f47b85c00",
+ "revision": "70c21fc8fb4b014e751d1442161c4beabbfaa6bd",
"repo_path": "integration/gaia-central"
}
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 0ace2017853c..667d23916d0d 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -17,7 +17,7 @@
-
+
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 50d1c80a4738..4e4502b4ec0d 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h b/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h
index c51b2f90bdd3..5bb186f2ebd0 100644
--- a/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h
+++ b/dom/bluetooth/bluedroid/b2g_bdroid_buildcfg.h
@@ -41,4 +41,9 @@
/* SDP AVRCP 1.5 feature */
#define SDP_AVRCP_1_5 FALSE
+/* BLE Feature */
+#define BTA_GATT_INCLUDED TRUE
+#define BLE_INCLUDED TRUE
+#define SMP_INCLUDED TRUE
+
#endif /* B2G_BDROID_BUILDCFG_H */
diff --git a/dom/camera/GonkCameraControl.cpp b/dom/camera/GonkCameraControl.cpp
index 090b1a65bc77..7b31e0ab3a58 100644
--- a/dom/camera/GonkCameraControl.cpp
+++ b/dom/camera/GonkCameraControl.cpp
@@ -179,7 +179,7 @@ nsGonkCameraControl::Initialize()
mCurrentConfiguration.mRecorderProfile.Truncate();
// Initialize our camera configuration database.
- PullParametersImpl();
+ mCameraHw->PullParameters(mParams);
// Set preferred preview frame format.
mParams.Set(CAMERA_PARAM_PREVIEWFORMAT, NS_LITERAL_STRING("yuv420sp"));
@@ -1127,7 +1127,13 @@ nsGonkCameraControl::PullParametersImpl()
DOM_CAMERA_LOGI("Pulling camera parameters\n");
RETURN_IF_NO_CAMERA_HW();
- return mCameraHw->PullParameters(mParams);
+ nsresult rv = mCameraHw->PullParameters(mParams);
+ mParams.Get(CAMERA_PARAM_THUMBNAILSIZE, mLastThumbnailSize);
+ mParams.Get(CAMERA_PARAM_PICTURE_SIZE, mCurrentConfiguration.mPictureSize);
+ mParams.Get(CAMERA_PARAM_PREVIEWSIZE, mCurrentConfiguration.mPreviewSize);
+ mParams.Get(CAMERA_PARAM_VIDEOSIZE, mLastRecorderSize);
+
+ return rv;
}
nsresult
diff --git a/dom/camera/test/test_camera_fake_parameters.html b/dom/camera/test/test_camera_fake_parameters.html
index da45ce7b0138..df98f2fce86b 100644
--- a/dom/camera/test/test_camera_fake_parameters.html
+++ b/dom/camera/test/test_camera_fake_parameters.html
@@ -527,6 +527,33 @@ suite.test('bug-1052851', function() {
.then(resolve, suite.rejectGetCamera);
});
+suite.test('bug-1124338', function() {
+ function triggerAutoFocus(p) {
+ var sync = new Promise(function(resolve, reject) {
+ function onEvent(e) {
+ suite.camera.removeEventListener('focus', onEvent);
+ var thumbnailSize = suite.camera.getThumbnailSize();
+ ok(thumbnailSize.width == 640 && thumbnailSize.height == 480, 'thumbnail size reset with auto focus');
+ resolve();
+ }
+ suite.camera.addEventListener('focus', onEvent);
+ });
+
+ var initThumbnailSize = suite.camera.getThumbnailSize();
+ ok(initThumbnailSize.width == 320 && initThumbnailSize.height == 240, 'initial thumbnail size incorrect');
+ suite.hw.params['jpeg-thumbnail-width'] = '640';
+ suite.hw.params['jpeg-thumbnail-height'] = '480';
+ suite.hw.fireAutoFocusComplete(false);
+ return sync;
+ }
+
+ suite.hw.params['jpeg-thumbnail-size-values'] = '320x240,640x480';
+ suite.hw.params['jpeg-thumbnail-width'] = '320';
+ suite.hw.params['jpeg-thumbnail-height'] = '240';
+ return suite.getCamera()
+ .then(triggerAutoFocus)
+});
+
suite.setup()
.then(suite.run);
diff --git a/hal/gonk/GonkDiskSpaceWatcher.cpp b/hal/gonk/GonkDiskSpaceWatcher.cpp
index ef3359525ef9..6caf13fb88f2 100644
--- a/hal/gonk/GonkDiskSpaceWatcher.cpp
+++ b/hal/gonk/GonkDiskSpaceWatcher.cpp
@@ -177,7 +177,7 @@ GonkDiskSpaceWatcher::DoStart()
NS_ASSERTION(XRE_GetIOMessageLoop() == MessageLoopForIO::current(),
"Not on the correct message loop");
- mFd = fanotify_init(FAN_CLASS_NOTIF, FAN_CLOEXEC);
+ mFd = fanotify_init(FAN_CLASS_NOTIF, FAN_CLOEXEC | O_LARGEFILE);
if (mFd == -1) {
if (errno == ENOSYS) {
NS_WARNING("Warning: No fanotify support in this device's kernel.\n");