resolved conflicts for merge of d3233ae9 to master

Change-Id: I59ecf8f2d3bd253f51457c11ec15f022ac5fdeb6
This commit is contained in:
Christopher Tate
2010-07-01 11:49:41 -07:00
5 changed files with 52 additions and 0 deletions

View File

@@ -571,6 +571,7 @@ public class WindowManagerService extends IWindowManager.Stub
mHaveInputMethods);
android.os.Process.setThreadPriority(
android.os.Process.THREAD_PRIORITY_DISPLAY);
android.os.Process.setCanSelfBackground(false);
synchronized (this) {
mService = s;
@@ -606,6 +607,7 @@ public class WindowManagerService extends IWindowManager.Stub
// Log.VERBOSE, "WindowManagerPolicy", Log.LOG_ID_SYSTEM));
android.os.Process.setThreadPriority(
android.os.Process.THREAD_PRIORITY_FOREGROUND);
android.os.Process.setCanSelfBackground(false);
mPolicy.init(mContext, mService, mPM);
synchronized (this) {