drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 40627de3: Merge "Remove unnecessary references in WindowManagerService"

Browse Source 
* commit '40627de3044c4a23c20c2229cab20aab21ff2b03':
  Remove unnecessary references in WindowManagerService
This commit is contained in:
Craig Mautner
2012-12-04 10:38:32 -08:00
committed by Android Git Automerger
parent 59912d40ba 40627de304
commit d3b9dd6ca6
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/java/com/android/server/wm/WindowManagerService.java
View File

@ -4139,8 +4139,7 @@ public class WindowManagerService extends IWindowManager.Stub
mStartingIconInTransition = false; mStartingIconInTransition = false;
mSkipAppTransitionAnimation = false; mSkipAppTransitionAnimation = false;
mH.removeMessages(H.APP_TRANSITION_TIMEOUT); mH.removeMessages(H.APP_TRANSITION_TIMEOUT);
mH.sendMessageDelayed(mH.obtainMessage(H.APP_TRANSITION_TIMEOUT), mH.sendEmptyMessageDelayed(H.APP_TRANSITION_TIMEOUT, 5000);
5000);
} }
} }
} }
@ -4711,8 +4710,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (mAppsFreezingScreen == 1) { if (mAppsFreezingScreen == 1) {
startFreezingDisplayLocked(false, 0, 0); startFreezingDisplayLocked(false, 0, 0);
mH.removeMessages(H.APP_FREEZE_TIMEOUT); mH.removeMessages(H.APP_FREEZE_TIMEOUT);
mH.sendMessageDelayed(mH.obtainMessage(H.APP_FREEZE_TIMEOUT), mH.sendEmptyMessageDelayed(H.APP_FREEZE_TIMEOUT, 5000);
5000);
} }
} }
final int N = wtoken.allAppWindows.size(); final int N = wtoken.allAppWindows.size();
@ -5232,8 +5230,7 @@ public class WindowManagerService extends IWindowManager.Stub
try { try {
startFreezingDisplayLocked(false, exitAnim, enterAnim); startFreezingDisplayLocked(false, exitAnim, enterAnim);
mH.removeMessages(H.CLIENT_FREEZE_TIMEOUT); mH.removeMessages(H.CLIENT_FREEZE_TIMEOUT);
mH.sendMessageDelayed(mH.obtainMessage(H.CLIENT_FREEZE_TIMEOUT), mH.sendEmptyMessageDelayed(H.CLIENT_FREEZE_TIMEOUT, 5000);
5000);
} finally { } finally {
Binder.restoreCallingIdentity(origId); Binder.restoreCallingIdentity(origId);
} }
@ -5361,7 +5358,7 @@ public class WindowManagerService extends IWindowManager.Stub
} }
// Persist setting // Persist setting
mH.obtainMessage(H.PERSIST_ANIMATION_SCALE).sendToTarget(); mH.sendEmptyMessage(H.PERSIST_ANIMATION_SCALE);
} }
public void setAnimationScales(float[] scales) { public void setAnimationScales(float[] scales) {
@ -5383,7 +5380,7 @@ public class WindowManagerService extends IWindowManager.Stub
} }
// Persist setting // Persist setting
mH.obtainMessage(H.PERSIST_ANIMATION_SCALE).sendToTarget(); mH.sendEmptyMessage(H.PERSIST_ANIMATION_SCALE);
} }
private void setAnimatorDurationScale(float scale) { private void setAnimatorDurationScale(float scale) {
@ -5493,8 +5490,7 @@ public class WindowManagerService extends IWindowManager.Stub
hideBootMessagesLocked(); hideBootMessagesLocked();
// If the screen still doesn't come up after 30 seconds, give // If the screen still doesn't come up after 30 seconds, give
// up and turn it on. // up and turn it on.
Message msg = mH.obtainMessage(H.BOOT_TIMEOUT); mH.sendEmptyMessageDelayed(H.BOOT_TIMEOUT, 30*1000);
mH.sendMessageDelayed(msg, 30*1000);
} }
mPolicy.systemBooted(); mPolicy.systemBooted();
@ -5517,7 +5513,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (!mSystemBooted && !mShowingBootMessages) { if (!mSystemBooted && !mShowingBootMessages) {
return; return;
} }
mH.sendMessage(mH.obtainMessage(H.ENABLE_SCREEN)); mH.sendEmptyMessage(H.ENABLE_SCREEN);
} }
public void performBootTimeout() { public void performBootTimeout() {
@ -6079,7 +6075,7 @@ public class WindowManagerService extends IWindowManager.Stub
mWindowsFreezingScreen = true; mWindowsFreezingScreen = true;
mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT); mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT);
mH.sendMessageDelayed(mH.obtainMessage(H.WINDOW_FREEZE_TIMEOUT), mH.sendEmptyMessageDelayed(H.WINDOW_FREEZE_TIMEOUT,
WINDOW_FREEZE_TIMEOUT_DURATION); WINDOW_FREEZE_TIMEOUT_DURATION);
mWaitingForConfig = true; mWaitingForConfig = true;
getDefaultDisplayContentLocked().layoutNeeded = true; getDefaultDisplayContentLocked().layoutNeeded = true;
@ -7608,8 +7604,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (mAnimator.mAnimating || mLayoutToAnim.mAnimationScheduled) { if (mAnimator.mAnimating || mLayoutToAnim.mAnimationScheduled) {
// If we are animating, don't do the gc now but // If we are animating, don't do the gc now but
// delay a bit so we don't interrupt the animation. // delay a bit so we don't interrupt the animation.
mH.sendMessageDelayed(mH.obtainMessage(H.FORCE_GC), sendEmptyMessageDelayed(H.FORCE_GC, 2000);
2000);
return; return;
} }
// If we are currently rotating the display, it will // If we are currently rotating the display, it will
@ -7734,7 +7729,7 @@ public class WindowManagerService extends IWindowManager.Stub
// Used to send multiple changes from the animation side to the layout side. // Used to send multiple changes from the animation side to the layout side.
synchronized (mWindowMap) { synchronized (mWindowMap) {
if (copyAnimToLayoutParamsLocked()) { if (copyAnimToLayoutParamsLocked()) {
mH.sendEmptyMessage(CLEAR_PENDING_ACTIONS); sendEmptyMessage(CLEAR_PENDING_ACTIONS);
performLayoutAndPlaceSurfacesLocked(); performLayoutAndPlaceSurfacesLocked();
} }
} }
@ -8323,7 +8318,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (mWindowsChanged && !mWindowChangeListeners.isEmpty()) { if (mWindowsChanged && !mWindowChangeListeners.isEmpty()) {
mH.removeMessages(H.REPORT_WINDOWS_CHANGE); mH.removeMessages(H.REPORT_WINDOWS_CHANGE);
mH.sendMessage(mH.obtainMessage(H.REPORT_WINDOWS_CHANGE)); mH.sendEmptyMessage(H.REPORT_WINDOWS_CHANGE);
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {
mInLayout = false; mInLayout = false;
@ -8519,8 +8514,8 @@ public class WindowManagerService extends IWindowManager.Stub
// XXX should probably keep timeout from // XXX should probably keep timeout from
// when we first froze the display. // when we first froze the display.
mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT); mH.removeMessages(H.WINDOW_FREEZE_TIMEOUT);
mH.sendMessageDelayed(mH.obtainMessage( mH.sendEmptyMessageDelayed(H.WINDOW_FREEZE_TIMEOUT,
H.WINDOW_FREEZE_TIMEOUT), WINDOW_FREEZE_TIMEOUT_DURATION); WINDOW_FREEZE_TIMEOUT_DURATION);
} }
} }
} }
@ -10197,8 +10192,7 @@ public class WindowManagerService extends IWindowManager.Stub
// processes holds on others can be released if they are // processes holds on others can be released if they are
// no longer needed. // no longer needed.
mH.removeMessages(H.FORCE_GC); mH.removeMessages(H.FORCE_GC);
mH.sendMessageDelayed(mH.obtainMessage(H.FORCE_GC), mH.sendEmptyMessageDelayed(H.FORCE_GC, 2000);
2000);
mScreenFrozenLock.release(); mScreenFrozenLock.release();