Bug 613321. Backing out bug 604712 (rev 6cfd43067a07) to fix hang on Galaxy S phones. a=blocking-fennec
authorStuart Parmenter <stuart@mozilla.com>
Sat, 20 Nov 2010 01:02:55 -0800
changeset 57945 baa6cc2f72e48cbb22e88bd574f5ef643f926a9c
parent 57944 37b59596c539b9fd75b18b555282664799d63faa
child 57946 af5a5452cda4fd6e83e9d797f484feb0e2429393
push id17093
push userpavlov@mozilla.com
push dateSat, 20 Nov 2010 09:11:07 +0000
treeherdermozilla-central@baa6cc2f72e4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblocking-fennec
bugs613321, 604712
milestone2.0b8pre
first release with
nightly linux32
baa6cc2f72e4 / 4.0b8pre / 20101120030848 / files
nightly linux64
baa6cc2f72e4 / 4.0b8pre / 20101120030846 / files
nightly mac
baa6cc2f72e4 / 4.0b8pre / 20101120030824 / files
nightly win32
baa6cc2f72e4 / 4.0b8pre / 20101120044537 / files
nightly win64
baa6cc2f72e4 / 4.0b8pre / 20101120044328 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 613321. Backing out bug 604712 (rev 6cfd43067a07) to fix hang on Galaxy S phones. a=blocking-fennec
xpcom/base/nsSystemInfo.cpp
--- a/xpcom/base/nsSystemInfo.cpp
+++ b/xpcom/base/nsSystemInfo.cpp
@@ -91,63 +91,54 @@ nsSystemInfo::Init()
     SetInt32Property(NS_LITERAL_STRING("memmapalign"), PR_GetMemMapAlignment());
     SetInt32Property(NS_LITERAL_STRING("cpucount"), PR_GetNumberOfProcessors());
     SetUint64Property(NS_LITERAL_STRING("memsize"), PR_GetPhysicalMemorySize());
 
 #ifdef MOZ_WIDGET_GTK2
     // This must be done here because NSPR can only separate OS's when compiled, not libraries.
     char* gtkver = PR_smprintf("GTK %u.%u.%u", gtk_major_version, gtk_minor_version, gtk_micro_version);
     if (gtkver) {
-      rv = SetPropertyAsACString(NS_LITERAL_STRING("secondaryLibrary"),
+      rv = SetPropertyAsACString(NS_ConvertASCIItoUTF16("secondaryLibrary"),
                                  nsDependentCString(gtkver));
       PR_smprintf_free(gtkver);
       NS_ENSURE_SUCCESS(rv, rv);
     }
 #endif
 
 
 #ifdef MOZ_PLATFORM_MAEMO
     char *  line = nsnull;
     size_t  len = 0;
     ssize_t read;
     FILE *fp = fopen ("/proc/component_version", "r");
     if (fp) {
       while ((read = getline(&line, &len, fp)) != -1) {
         if (line) {
           if (strstr(line, "RX-51")) {
-            SetPropertyAsACString(NS_LITERAL_STRING("device"), NS_LITERAL_CSTRING("Nokia N900"));
-            SetPropertyAsACString(NS_LITERAL_STRING("manufacturer"), NS_LITERAL_CSTRING("Nokia"));
-            SetPropertyAsACString(NS_LITERAL_STRING("hardware"), NS_LITERAL_CSTRING("RX-51"));
+            SetPropertyAsACString(NS_ConvertASCIItoUTF16("device"), NS_LITERAL_CSTRING("Nokia N900"));
             break;
           } else if (strstr(line, "RX-44") ||
                      strstr(line, "RX-48") ||
                      strstr(line, "RX-32") ) {
-            /* not as accurate as we can be, but these devices are deprecated */
-            SetPropertyAsACString(NS_LITERAL_STRING("device"), NS_LITERAL_CSTRING("Nokia N8xx"));
-            SetPropertyAsACString(NS_LITERAL_STRING("manufacturer"), NS_LITERAL_CSTRING("Nokia"));
-            SetPropertyAsACString(NS_LITERAL_STRING("hardware"), NS_LITERAL_CSTRING("N8xx"));
+            SetPropertyAsACString(NS_ConvertASCIItoUTF16("device"), NS_LITERAL_CSTRING("Nokia N8xx"));
             break;
           }
         }
       }
       if (line)
         free(line);
       fclose(fp);
     }
 #endif
 
 #ifdef ANDROID
     if (mozilla::AndroidBridge::Bridge()) {
         nsAutoString str;
         if (mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build", "MODEL", str))
             SetPropertyAsAString(NS_LITERAL_STRING("device"), str);
-        if (mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build", "MANUFACTURER", str))
-            SetPropertyAsAString(NS_LITERAL_STRING("manufacturer"), str);
-        if (mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build", "HARDWARE", str))
-            SetPropertyAsAString(NS_LITERAL_STRING("hardware"), str);
     }
 #endif
     return NS_OK;
 }
 
 void
 nsSystemInfo::SetInt32Property(const nsAString &aPropertyName,
                                const PRInt32 aValue)