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

Fix issue #2859543: PhoneStatusBar appears at startup after wipe

Browse Source 
Change-Id: I63c8fcd7152a99ba7f2c3d57a5ad9ceaf05529d7
This commit is contained in:
Dianne Hackborn
2010-07-29 12:51:35 -07:00
parent 571a629f29
commit 5132b37018
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
services/java/com/android/server/WindowManagerService.java
View File

@@ -1790,18 +1790,11 @@ public class WindowManagerService extends IWindowManager.Stub
boolean reportNewConfig = false;
WindowState attachedWindow = null;
WindowState win = null;
long origId;
synchronized(mWindowMap) {
// Instantiating a Display requires talking with the simulator,
// so don't do it until we know the system is mostly up and
// running.
if (mDisplay == null) {
WindowManager wm = (WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE);
mDisplay = wm.getDefaultDisplay();
mInitialDisplayWidth = mDisplay.getWidth();
mInitialDisplayHeight = mDisplay.getHeight();
mInputManager.setDisplaySize(0, mInitialDisplayWidth, mInitialDisplayHeight);
reportNewConfig = true;
throw new IllegalStateException("Display has not been initialialized");
}
if (mWindowMap.containsKey(client.asBinder())) {
@@ -1907,7 +1900,7 @@ public class WindowManagerService extends IWindowManager.Stub
res = WindowManagerImpl.ADD_OKAY;
final long origId = Binder.clearCallingIdentity();
origId = Binder.clearCallingIdentity();
if (addToken) {
mTokenMap.put(attrs.token, token);
@@ -1984,14 +1977,10 @@ public class WindowManagerService extends IWindowManager.Stub
}
}
// sendNewConfiguration() checks caller permissions so we must call it with
// privilege. updateOrientationFromAppTokens() clears and resets the caller
// identity anyway, so it's safe to just clear & restore around this whole
// block.
final long origId = Binder.clearCallingIdentity();
if (reportNewConfig) {
sendNewConfiguration();
}
Binder.restoreCallingIdentity(origId);
return res;
@@ -5543,6 +5532,24 @@ public class WindowManagerService extends IWindowManager.Stub
mPolicy.systemReady();
}
public void initDisplay() {
synchronized(mWindowMap) {
if (mDisplay != null) {
throw new IllegalStateException("Display already initialized");
}
WindowManager wm = (WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE);
mDisplay = wm.getDefaultDisplay();
mInitialDisplayWidth = mDisplay.getWidth();
mInitialDisplayHeight = mDisplay.getHeight();
mInputManager.setDisplaySize(0, mInitialDisplayWidth, mInitialDisplayHeight);
}
try {
mActivityManager.updateConfiguration(null);
} catch (RemoteException e) {
}
}
// -------------------------------------------------------------
// Client Session State
// -------------------------------------------------------------