commit d9584858448d8a2589ea9e5a34b4a48135c0b087
author Kristian Monsen <kristianm@google.com> Wed May 25 12:09:56 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 25 12:09:56 2011 -0700
tree 3ad1dbf46ef3a46a3b978a3e1a8fb91ea85dc1bf
parent da846dd889c8ee79a322f71bc1947aab1f0904e9
parent 69a54910a3f041e108dc847f16be5ded186c3d0b

Merge "Merge chromium to 10.0.634.0: Compile fix"

cmds/runtime/main_runtime.cpp

diff --git a/cmds/runtime/main_runtime.cpp b/cmds/runtime/main_runtime.cpp
index 785e4cc..dbff095 100644
--- a/cmds/runtime/main_runtime.cpp
+++ b/cmds/runtime/main_runtime.cpp
@@ -497,7 +497,7 @@
 #ifndef HAVE_ANDROID_OS
         QuickRuntime* runt = new QuickRuntime();
         runt->start("com/android/server/SystemServer",
-                    false /* spontaneously fork system server from zygote */);
+                    "" /* spontaneously fork system server from zygote */);
 #endif
     }
 

include/utils/ResourceTypes.h

diff --git a/include/utils/ResourceTypes.h b/include/utils/ResourceTypes.h
index 9e4e132..2c7cf75 100644
--- a/include/utils/ResourceTypes.h
+++ b/include/utils/ResourceTypes.h
@@ -953,6 +953,7 @@
         UI_MODE_TYPE_NORMAL = ACONFIGURATION_UI_MODE_TYPE_NORMAL,
         UI_MODE_TYPE_DESK = ACONFIGURATION_UI_MODE_TYPE_DESK,
         UI_MODE_TYPE_CAR = ACONFIGURATION_UI_MODE_TYPE_CAR,
+        UI_MODE_TYPE_TELEVISION = ACONFIGURATION_UI_MODE_TYPE_TELEVISION,
 
         // uiMode bits for the night switch.
         MASK_UI_MODE_NIGHT = 0x30,