From d987e58396608d577e569f2a2356bde71f7120b4 Mon Sep 17 00:00:00 2001 From: Doug Turner Date: Tue, 1 Feb 2011 22:30:09 -0800 Subject: [PATCH] Bug 630595. Backing out f05874a6bac5. r=blassey. a=blocking-fennec --- widget/src/android/nsMemoryWatcher.cpp | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/widget/src/android/nsMemoryWatcher.cpp b/widget/src/android/nsMemoryWatcher.cpp index 27e136d8551..35a1b144f68 100644 --- a/widget/src/android/nsMemoryWatcher.cpp +++ b/widget/src/android/nsMemoryWatcher.cpp @@ -40,9 +40,6 @@ #include "android/log.h" #include "nsString.h" #include "nsAppShell.h" -#include "nsIPropertyBag2.h" -#include "nsIServiceManager.h" -#include "nsXULAppAPI.h" NS_IMPL_ISUPPORTS1(nsMemoryWatcher, nsITimerCallback) @@ -76,27 +73,7 @@ nsMemoryWatcher::StartWatching() { if (mTimer) return; - - // Prevent this from running in the child process - if (XRE_GetProcessType() != GeckoProcessType_Default) - return; - - // Prevent this from running anything but the devices that need it - nsCOMPtr sysInfo = do_GetService("@mozilla.org/system-info;1"); - if (sysInfo) { - nsCString deviceType; - nsresult rv = sysInfo->GetPropertyAsACString(NS_LITERAL_STRING("device"), - deviceType); - if (NS_SUCCEEDED(rv)) { - if (! deviceType.EqualsLiteral("Nexus S")) - return; - } - } - - __android_log_print(ANDROID_LOG_WARN, "Gecko", - "!!!!!!!!! Watching Memory...."); - - + mMemInfoFile = fopen("/proc/meminfo", "r"); NS_ASSERTION(mMemInfoFile, "Could not open /proc/meminfo for reading.");