diff --git a/CLOBBER b/CLOBBER
index e0e8a2acfe89..d7ecd607a4e4 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.
-Bug 1182727 - Changed toolchain, needs clobber again :(
+Bug 1210755 - Android build: Switch to Android 6.0 SDK / API 23
diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml
index a96a0edf5067..fa381995fd49 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 10cdafad50bc..e6d93db6e115 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 336dfb217181..17ed8e3480e2 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 d9a4164648e6..b85821e6120e 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 c16aa4cea85c..e07de16b1559 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 2d2312c45092..1baf3418253a 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 336dfb217181..17ed8e3480e2 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 66ddcceb7e4e..af584905fa3f 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 fd5de42ec3f2..a72fcf6cc665 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
{
"git": {
- "git_revision": "1f226126dcba8af16c8db08556130b0bb04bb8d3",
+ "git_revision": "60cdaa3d3424db3432dc903e7f9c6c8fa099c06d",
"remote": "https://git.mozilla.org/releases/gaia.git",
"branch": ""
},
- "revision": "44cf4f0a2b14c88e117d9c8cf76779d0a7c26999",
+ "revision": "1de2dfa13b0b91c293111198011353c7bb86242d",
"repo_path": "integration/gaia-central"
}
diff --git a/b2g/config/nexus-4-kk/sources.xml b/b2g/config/nexus-4-kk/sources.xml
index a1d5d70afcf9..cc6f720cd2d8 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 43ff2a237328..671e16d0af60 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 b82a14bb05f8..5ae9e0c3c5d5 100644
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -15,7 +15,7 @@
-
+
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 8bc6179edbd9..69a4914e0906 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -713,7 +713,6 @@
-
diff --git a/browser/base/content/popup-notifications.inc b/browser/base/content/popup-notifications.inc
index b50ff5e6fb30..44fd8e2cdb8e 100644
--- a/browser/base/content/popup-notifications.inc
+++ b/browser/base/content/popup-notifications.inc
@@ -6,6 +6,7 @@
position="after_start"
hidden="true"
orient="vertical"
+ noautofocus="true"
role="alert"/>
diff --git a/browser/base/content/test/alerts/browser.ini b/browser/base/content/test/alerts/browser.ini
new file mode 100644
index 000000000000..cde60ad06a94
--- /dev/null
+++ b/browser/base/content/test/alerts/browser.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+support-files =
+ file_dom_notifications.html
+
+[browser_notification_open_settings.js]
+[browser_notification_tab_switching.js]
+skip-if = buildapp == 'mulet' || e10s # Bug 1100662 - content access causing uncaught exception - Error: cannot ipc non-cpow object at chrome://mochitests/content/browser/browser/base/content/test/general/browser_notification_tab_switching.js:32 (or in RemoteAddonsChild.jsm)
diff --git a/browser/base/content/test/alerts/browser_notification_open_settings.js b/browser/base/content/test/alerts/browser_notification_open_settings.js
new file mode 100644
index 000000000000..f339af140fb1
--- /dev/null
+++ b/browser/base/content/test/alerts/browser_notification_open_settings.js
@@ -0,0 +1,18 @@
+"use strict";
+
+add_task(function* test_settingsOpen() {
+ info("Opening a dummy tab so openPreferences=>switchToTabHavingURI doesn't use the blank tab.");
+ yield BrowserTestUtils.withNewTab({
+ gBrowser,
+ url: "about:robots"
+ }, function* dummyTabTask(aBrowser) {
+ let tabPromise = BrowserTestUtils.waitForNewTab(gBrowser, "about:preferences#content");
+ info("simulate a notifications-open-settings notification");
+ let uri = NetUtil.newURI("https://example.com");
+ let principal = Services.scriptSecurityManager.createCodebasePrincipal(uri, {});
+ Services.obs.notifyObservers(principal, "notifications-open-settings", null);
+ let tab = yield tabPromise;
+ ok(tab, "The notification settings tab opened");
+ BrowserTestUtils.removeTab(tab);
+ });
+});
diff --git a/browser/base/content/test/general/browser_notification_tab_switching.js b/browser/base/content/test/alerts/browser_notification_tab_switching.js
similarity index 95%
rename from browser/base/content/test/general/browser_notification_tab_switching.js
rename to browser/base/content/test/alerts/browser_notification_tab_switching.js
index 161e4e14958d..482b54fbb63a 100644
--- a/browser/base/content/test/general/browser_notification_tab_switching.js
+++ b/browser/base/content/test/alerts/browser_notification_tab_switching.js
@@ -6,7 +6,7 @@
var tab;
var notification;
-var notificationURL = "http://example.org/browser/browser/base/content/test/general/file_dom_notifications.html";
+var notificationURL = "http://example.org/browser/browser/base/content/test/alerts/file_dom_notifications.html";
var newWindowOpenedFromTab;
function test () {
@@ -58,7 +58,7 @@ function onAlertShowing() {
info("Notification alert showing");
notification.removeEventListener("show", onAlertShowing);
- let alertWindow = findChromeWindowByURI("chrome://global/content/alerts/alert.xul");
+ let alertWindow = Services.wm.getMostRecentWindow("alert:alert");
if (!alertWindow) {
todo(false, "Notifications don't use XUL windows on all platforms.");
notification.close();
diff --git a/browser/base/content/test/general/file_dom_notifications.html b/browser/base/content/test/alerts/file_dom_notifications.html
similarity index 97%
rename from browser/base/content/test/general/file_dom_notifications.html
rename to browser/base/content/test/alerts/file_dom_notifications.html
index 078c94a42d18..7cbdebdd48e0 100644
--- a/browser/base/content/test/general/file_dom_notifications.html
+++ b/browser/base/content/test/alerts/file_dom_notifications.html
@@ -1,5 +1,6 @@
+
diff --git a/dom/push/test/test_has_permissions.html b/dom/push/test/test_has_permissions.html
index db54a1ffb577..72337f91fcf1 100644
--- a/dom/push/test/test_has_permissions.html
+++ b/dom/push/test/test_has_permissions.html
@@ -65,7 +65,7 @@ http://creativecommons.org/licenses/publicdomain/
}).then(SimpleTest.finish);
}
- SpecialPowers.addPermission('push', false, document);
+ SpecialPowers.addPermission("desktop-notification", false, document);
SpecialPowers.pushPrefEnv({"set": [
["dom.push.enabled", true],
["dom.serviceWorkers.exemptFromPerDomainMax", true],
diff --git a/dom/push/test/test_multiple_register.html b/dom/push/test/test_multiple_register.html
index be7bb574a87a..34df563a755c 100644
--- a/dom/push/test/test_multiple_register.html
+++ b/dom/push/test/test_multiple_register.html
@@ -125,7 +125,7 @@ http://creativecommons.org/licenses/publicdomain/
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);
- SpecialPowers.addPermission('push', true, document);
+ SpecialPowers.addPermission("desktop-notification", true, document);
SimpleTest.waitForExplicitFinish();
diff --git a/dom/push/test/test_multiple_register_different_scope.html b/dom/push/test/test_multiple_register_different_scope.html
index 3915c54b8d7a..5cfafdb66873 100644
--- a/dom/push/test/test_multiple_register_different_scope.html
+++ b/dom/push/test/test_multiple_register_different_scope.html
@@ -119,7 +119,7 @@ http://creativecommons.org/licenses/publicdomain/
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);
- SpecialPowers.addPermission('push', true, document);
+ SpecialPowers.addPermission("desktop-notification", true, document);
SimpleTest.waitForExplicitFinish();
diff --git a/dom/push/test/test_multiple_register_during_service_activation.html b/dom/push/test/test_multiple_register_during_service_activation.html
index 2c6dcb7904f3..4af23813384d 100644
--- a/dom/push/test/test_multiple_register_during_service_activation.html
+++ b/dom/push/test/test_multiple_register_during_service_activation.html
@@ -107,7 +107,7 @@ var defaultServerURL = SpecialPowers.getCharPref("dom.push.serverURL");
["dom.serviceWorkers.testing.enabled", true],
["dom.push.serverURL", "wss://something.org"]
]}, runTest);
- SpecialPowers.addPermission('push', true, document);
+ SpecialPowers.addPermission("desktop-notification", true, document);
SimpleTest.waitForExplicitFinish();
diff --git a/dom/push/test/test_permissions.html b/dom/push/test/test_permissions.html
index e171fd5a4765..4d580ed8a617 100644
--- a/dom/push/test/test_permissions.html
+++ b/dom/push/test/test_permissions.html
@@ -71,13 +71,33 @@ http://creativecommons.org/licenses/publicdomain/
}
function checkPermissionState(swr) {
- return swr.pushManager.permissionState().then(function(state) {
- ok(state === "denied", "permissionState() should resolve to denied.");
- return swr;
- }).catch(function(e) {
- ok(false, "permissionState() should resolve to denied.");
- return swr;
- });
+ var permissionManager = SpecialPowers.Ci.nsIPermissionManager;
+ var tests = [{
+ action: permissionManager.ALLOW_ACTION,
+ state: "granted",
+ }, {
+ action: permissionManager.DENY_ACTION,
+ state: "denied",
+ }, {
+ action: permissionManager.PROMPT_ACTION,
+ state: "prompt",
+ }, {
+ action: permissionManager.UNKNOWN_ACTION,
+ state: "prompt",
+ }];
+ return tests.reduce((promise, test) => {
+ return promise.then(function() {
+ if (test.action == permissionManager.UNKNOWN_ACTION) {
+ SpecialPowers.removePermission("desktop-notification", document);
+ } else {
+ SpecialPowers.addPermission("desktop-notification",
+ test.action, document);
+ }
+ return swr.pushManager.permissionState().then(state => {
+ is(state, test.state, JSON.stringify(test));
+ });
+ });
+ }, Promise.resolve());
}
function runTest() {
@@ -91,7 +111,7 @@ http://creativecommons.org/licenses/publicdomain/
}).then(SimpleTest.finish);
}
- SpecialPowers.addPermission('push', false, document);
+ SpecialPowers.addPermission("desktop-notification", false, document);
SpecialPowers.pushPrefEnv({"set": [
["dom.push.enabled", true],
["dom.serviceWorkers.exemptFromPerDomainMax", true],
diff --git a/dom/push/test/test_register.html b/dom/push/test/test_register.html
index 510fd0e399c9..62366239013e 100644
--- a/dom/push/test/test_register.html
+++ b/dom/push/test/test_register.html
@@ -131,7 +131,7 @@ http://creativecommons.org/licenses/publicdomain/
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);
- SpecialPowers.addPermission('push', true, document);
+ SpecialPowers.addPermission("desktop-notification", true, document);
SimpleTest.waitForExplicitFinish();
diff --git a/dom/push/test/test_try_registering_offline_disabled.html b/dom/push/test/test_try_registering_offline_disabled.html
index 0b61b80b70c4..d455eae985e0 100644
--- a/dom/push/test/test_try_registering_offline_disabled.html
+++ b/dom/push/test/test_try_registering_offline_disabled.html
@@ -293,7 +293,7 @@ http://creativecommons.org/licenses/publicdomain/
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);
- SpecialPowers.addPermission('push', true, document);
+ SpecialPowers.addPermission("desktop-notification", true, document);
SimpleTest.waitForExplicitFinish();
diff --git a/dom/push/test/test_unregister.html b/dom/push/test/test_unregister.html
index 15459a59553d..461fe8952eac 100644
--- a/dom/push/test/test_unregister.html
+++ b/dom/push/test/test_unregister.html
@@ -85,7 +85,7 @@ http://creativecommons.org/licenses/publicdomain/
["dom.serviceWorkers.enabled", true],
["dom.serviceWorkers.testing.enabled", true]
]}, runTest);
- SpecialPowers.addPermission('push', true, document);
+ SpecialPowers.addPermission("desktop-notification", true, document);
SimpleTest.waitForExplicitFinish();
diff --git a/dom/requestsync/RequestSyncService.jsm b/dom/requestsync/RequestSyncService.jsm
index 4e6bdda06973..e83af45d1359 100644
--- a/dom/requestsync/RequestSyncService.jsm
+++ b/dom/requestsync/RequestSyncService.jsm
@@ -98,7 +98,7 @@ this.RequestSyncService = {
// operation is completed.
this.dbTxn("readonly", function(aStore) {
- aStore.openCursor().onsuccess = function(event) {
+ aStore.openCursor().onsuccess = event => {
let cursor = event.target.result;
if (cursor) {
this.addRegistration(cursor.value, cursor.continue);
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index e19d5cbeaf5e..0ee6c11e1de1 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -66,6 +66,7 @@ JAVA_CLASSPATH += \
ifdef MOZ_NATIVE_DEVICES
JAVA_CLASSPATH += \
$(ANDROID_PLAY_SERVICES_BASE_AAR_LIB) \
+ $(ANDROID_PLAY_SERVICES_BASEMENT_AAR_LIB) \
$(ANDROID_PLAY_SERVICES_CAST_AAR_LIB) \
$(ANDROID_MEDIAROUTER_V7_AAR_LIB) \
$(ANDROID_MEDIAROUTER_V7_AAR_INTERNAL_LIB) \
@@ -86,6 +87,7 @@ java_bundled_libs := \
ifdef MOZ_NATIVE_DEVICES
java_bundled_libs += \
$(ANDROID_PLAY_SERVICES_BASE_AAR_LIB) \
+ $(ANDROID_PLAY_SERVICES_BASEMENT_AAR_LIB) \
$(ANDROID_PLAY_SERVICES_CAST_AAR_LIB) \
$(ANDROID_MEDIAROUTER_V7_AAR_LIB) \
$(ANDROID_MEDIAROUTER_V7_AAR_INTERNAL_LIB) \
@@ -372,6 +374,7 @@ generated/android/support/v7/appcompat/R.java: .aapt.deps ;
generated/android/support/v7/mediarouter/R.java: .aapt.deps ;
generated/android/support/v7/recyclerview/R.java: .aapt.deps ;
generated/com/google/android/gms/R.java: .aapt.deps ;
+generated/com/google/android/gms/base/R.java: .aapt.deps ;
generated/com/google/android/gms/cast/R.java: .aapt.deps ;
gecko.ap_: .aapt.deps ;
diff --git a/mobile/android/base/home/BrowserSearch.java b/mobile/android/base/home/BrowserSearch.java
index 6ed13ba2b169..dddb1a7df615 100644
--- a/mobile/android/base/home/BrowserSearch.java
+++ b/mobile/android/base/home/BrowserSearch.java
@@ -14,6 +14,7 @@ import java.util.Locale;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import org.mozilla.gecko.AppConstants;
import org.mozilla.gecko.annotation.RobocopTarget;
import org.mozilla.gecko.EventDispatcher;
import org.mozilla.gecko.GeckoAppShell;
@@ -25,6 +26,7 @@ import org.mozilla.gecko.Tab;
import org.mozilla.gecko.Tabs;
import org.mozilla.gecko.Telemetry;
import org.mozilla.gecko.TelemetryContract;
+import org.mozilla.gecko.db.BrowserContract;
import org.mozilla.gecko.db.BrowserContract.History;
import org.mozilla.gecko.db.BrowserContract.URLColumns;
import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
@@ -35,6 +37,7 @@ import org.mozilla.gecko.util.StringUtils;
import org.mozilla.gecko.util.ThreadUtils;
import android.app.Activity;
+import android.content.ContentResolver;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
@@ -94,6 +97,7 @@ public class BrowserSearch extends HomeFragment
// AsyncTask loader ID for suggestion query
private static final int LOADER_ID_SUGGESTION = 1;
+ private static final int LOADER_ID_SAVED_SUGGESTION = 2;
// Timeout for the suggestion client to respond
private static final int SUGGESTION_TIMEOUT = 3000;
@@ -137,6 +141,9 @@ public class BrowserSearch extends HomeFragment
// Access to this member must only occur from the UI thread.
private List