From 296154921cb40cd866723c515c018e277db78d67 Mon Sep 17 00:00:00 2001
From: Gabriele Svelto <gsvelto@mozilla.com>
Date: Wed, 5 Jun 2013 16:35:57 +0200
Subject: [PATCH 1/2] Bug 877222 - Increase the low memory notification
 threshold to increase the chance of triggering it. r=jlebar

---
 b2g/app/b2g.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index 5f3ccfc33d1e..aaecadd41ff8 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -610,7 +610,7 @@ pref("hal.processPriorityManager.gonk.LowCPUNice", 18);
 // this too high, then we'll send out a memory pressure event every Z seconds
 // (see below), even while we have processes that we would happily kill in
 // order to free up memory.
-pref("hal.processPriorityManager.gonk.notifyLowMemUnderMB", 10);
+pref("hal.processPriorityManager.gonk.notifyLowMemUnderMB", 14);
 
 // We wait this long before polling the memory-pressure fd after seeing one
 // memory pressure event.  (When we're not under memory pressure, we sit

From 4fa185a7dee827b8bbfdb5fe1759e5607c61ad56 Mon Sep 17 00:00:00 2001
From: Austin King <ozten@mozilla.com>
Date: Sat, 8 Jun 2013 13:50:25 -0700
Subject: [PATCH 2/2] Bug 881014 - Cancel buttons in UI should call RP's
 oncancel method. r=jedp

---
 b2g/chrome/content/identity.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/b2g/chrome/content/identity.js b/b2g/chrome/content/identity.js
index 38532e3ad9a3..efa492168ccd 100644
--- a/b2g/chrome/content/identity.js
+++ b/b2g/chrome/content/identity.js
@@ -109,13 +109,16 @@ function doInternalRequest() {
             method: 'login',
             assertion: assertion,
             _internalParams: internalParams});
+        } else {
+          identityCall({
+            method: 'cancel'
+          });
         }
         closeIdentityDialog();
       },
       stringifiedOptions);
   }
 }
-
 function doInternalLogout(aOptions) {
   log("doInternalLogout:", (options && isLoaded));
   if (options && isLoaded) {