am c40771a9: Merge "Fix bug with preloading recent tasks" into jb-mr1-dev

* commit 'c40771a90d348b59ce0ffb8654f2d0cde39d7384':
  Fix bug with preloading recent tasks
This commit is contained in:
Michael Jurka
2012-08-16 13:22:26 -07:00
committed by Android Git Automerger

View File

@@ -1717,6 +1717,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mHomePressed = false; mHomePressed = false;
mHomeLongPressed = false; mHomeLongPressed = false;
if (!homeWasLongPressed) { if (!homeWasLongPressed) {
if (mLongPressOnHomeBehavior == LONG_PRESS_HOME_RECENT_SYSTEM_UI) {
try { try {
IStatusBarService statusbar = getStatusBarService(); IStatusBarService statusbar = getStatusBarService();
if (statusbar != null) { if (statusbar != null) {
@@ -1727,6 +1728,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// re-acquire status bar service next time it is needed. // re-acquire status bar service next time it is needed.
mStatusBarService = null; mStatusBarService = null;
} }
}
mHomePressed = false; mHomePressed = false;
if (!canceled) { if (!canceled) {