From 080c656e574ed97f469b26e30d494c258af11832 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Tue, 3 Jan 2012 10:28:54 -0800
Subject: [PATCH] Bug 712517 - Disable ActivityObserver on Android to fix blank
 screen bugs [r=mfinkle]

---
 mobile/xul/chrome/content/browser.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mobile/xul/chrome/content/browser.js b/mobile/xul/chrome/content/browser.js
index a0007d18b0ae..95c97e64f335 100644
--- a/mobile/xul/chrome/content/browser.js
+++ b/mobile/xul/chrome/content/browser.js
@@ -361,12 +361,15 @@ var Browser = {
     os.addObserver(SessionHistoryObserver, "browser:purge-session-history", false);
     os.addObserver(ContentCrashObserver, "ipc:content-shutdown", false);
     os.addObserver(MemoryObserver, "memory-pressure", false);
+#ifndef ANDROID
+    // Disabled on Android because of bug 712517
     os.addObserver(ActivityObserver, "application-background", false);
     os.addObserver(ActivityObserver, "application-foreground", false);
     os.addObserver(ActivityObserver, "system-active", false);
     os.addObserver(ActivityObserver, "system-idle", false);
     os.addObserver(ActivityObserver, "system-display-on", false);
     os.addObserver(ActivityObserver, "system-display-off", false);
+#endif
 
     // Listens for change in the viewable area
 #if MOZ_PLATFORM_MAEMO == 6
@@ -534,12 +537,15 @@ var Browser = {
     os.removeObserver(SessionHistoryObserver, "browser:purge-session-history");
     os.removeObserver(ContentCrashObserver, "ipc:content-shutdown");
     os.removeObserver(MemoryObserver, "memory-pressure");
+#ifndef ANDROID
+    // Disabled on Android because of bug 712517
     os.removeObserver(ActivityObserver, "application-background", false);
     os.removeObserver(ActivityObserver, "application-foreground", false);
     os.removeObserver(ActivityObserver, "system-active", false);
     os.removeObserver(ActivityObserver, "system-idle", false);
     os.removeObserver(ActivityObserver, "system-display-on", false);
     os.removeObserver(ActivityObserver, "system-display-off", false);
+#endif
 
     window.controllers.removeController(this);
     window.controllers.removeController(BrowserUI);