Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 94e8471a: Merge "Fix issue #5405788: Device continuously opening and closing..."

Browse Source 
* commit '94e8471a956d46f4fae3da2b1e79862e07209efa':
  Fix issue #5405788: Device continuously opening and closing...
This commit is contained in:
Dianne Hackborn
2011-10-10 16:10:02 -07:00
committed by Android Git Automerger
parent 4901a15839 94e8471a95
commit 091ff486ab
9 changed files with 79 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/SystemServer.java
View File

@@ -165,6 +165,11 @@ class ServerThread extends Thread {
pm = PackageManagerService.main(context,
factoryTest != SystemServer.FACTORY_TEST_OFF,
onlyCore);
boolean firstBoot = false;
try {
firstBoot = pm.isFirstBoot();
} catch (RemoteException e) {
}
ActivityManagerService.setSystemProcess();
@@ -210,7 +215,8 @@ class ServerThread extends Thread {
Slog.i(TAG, "Window Manager");
wm = WindowManagerService.main(context, power,
factoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL);
factoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL,
!firstBoot);
ServiceManager.addService(Context.WINDOW_SERVICE, wm);
ActivityManagerService.self().setWindowManager(wm);