diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index 1c97edb9e17..48a9d8c5133 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 19ed9e6b3ec..da507e235d4 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 3191b8a6414..c97e560ce5e 100644
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml
index 5af4a108200..b54ed81f9bc 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 8ff7227c856..d959e4d3c48 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 1ae79801a9e..05a9735edf2 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 3191b8a6414..c97e560ce5e 100644
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml
index 68b039172af..2b4233ebdc6 100644
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -15,7 +15,7 @@
-
+
@@ -126,7 +126,7 @@
-
+
diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 4647e5a95f0..34a505fc55b 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
{
"git": {
- "git_revision": "d886e152b42e557db612470d3417fe2947cbdeee",
+ "git_revision": "ad15b4f1f50f4e28170a069f049e5bdeec8d15cc",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
- "revision": "dfac5317cf962dba4128208821470cd50b01509b",
+ "revision": "f9f1dd1ec78eac04af587f54518e6d557209ca75",
"repo_path": "integration/gaia-central"
}
diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml
index e87ce7b0122..bd509ddc7ee 100644
--- a/b2g/config/nexus-4-kk/sources.xml
+++ b/b2g/config/nexus-4-kk/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml
index 2f3a0325792..f4935bbb3d9 100644
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml
index 3a385b70e19..0dbd9cd42bd 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/mobile/android/b2gdroid/app/b2gdroid.js b/mobile/android/b2gdroid/app/b2gdroid.js
index bf1ddd2dfc0..c71adcc1900 100644
--- a/mobile/android/b2gdroid/app/b2gdroid.js
+++ b/mobile/android/b2gdroid/app/b2gdroid.js
@@ -543,7 +543,6 @@ pref("layers.acceleration.disabled", false);
pref("layers.offmainthreadcomposition.enabled", true);
pref("layers.async-video.enabled", true);
-#ifdef MOZ_ANDROID_APZ
pref("layers.async-pan-zoom.enabled", true);
// APZ physics settings, tuned by UX designers
pref("apz.axis_lock.mode", 2); // Use "sticky" axis locking
@@ -554,7 +553,6 @@ pref("apz.fling_curve_function_y2", "1.0");
pref("apz.fling_curve_threshold_inches_per_ms", "0.01");
pref("apz.fling_friction", "0.0019");
pref("apz.max_velocity_inches_per_ms", "0.07");
-#endif
pref("layers.progressive-paint", true);
pref("layers.low-precision-buffer", true);
diff --git a/mobile/android/b2gdroid/app/src/main/java/com/google/android/mms/pdu/EncodedStringValue.java b/mobile/android/b2gdroid/app/src/main/java/com/google/android/mms/pdu/EncodedStringValue.java
index 9495c1c5700..49a6c08bbb4 100644
--- a/mobile/android/b2gdroid/app/src/main/java/com/google/android/mms/pdu/EncodedStringValue.java
+++ b/mobile/android/b2gdroid/app/src/main/java/com/google/android/mms/pdu/EncodedStringValue.java
@@ -145,7 +145,7 @@ public class EncodedStringValue implements Cloneable {
}
try {
return new String(mData, CharacterSets.MIMENAME_ISO_8859_1);
- } catch (UnsupportedEncodingException _) {
+ } catch (UnsupportedEncodingException ex) {
return new String(mData); // system default encoding.
}
}
@@ -216,7 +216,7 @@ public class EncodedStringValue implements Cloneable {
try {
ret[i] = new EncodedStringValue(mCharacterSet,
temp[i].getBytes());
- } catch (NullPointerException _) {
+ } catch (NullPointerException e) {
// Can't arrive here
return null;
}
diff --git a/mobile/android/b2gdroid/config/mozconfigs/common b/mobile/android/b2gdroid/config/mozconfigs/common
index 71143fd46ce..e31a60d5123 100644
--- a/mobile/android/b2gdroid/config/mozconfigs/common
+++ b/mobile/android/b2gdroid/config/mozconfigs/common
@@ -43,8 +43,6 @@ ac_add_options --with-android-version=9
ac_add_options --with-system-zlib
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-android-apz
-
# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
ac_add_options --enable-warnings-as-errors
diff --git a/mobile/android/b2gdroid/confvars.sh b/mobile/android/b2gdroid/confvars.sh
index 64403663d8a..18fa020b605 100644
--- a/mobile/android/b2gdroid/confvars.sh
+++ b/mobile/android/b2gdroid/confvars.sh
@@ -48,6 +48,7 @@ MOZ_PLACES=
MOZ_SOCIAL=
MOZ_ANDROID_HISTORY=1
MOZ_DISABLE_EXPORT_JS=1
+MOZ_ANDROID_APZ=1
# use custom widget for html:select
MOZ_USE_NATIVE_POPUP_WINDOWS=1