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,15 +1717,17 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mHomePressed = false; mHomePressed = false;
mHomeLongPressed = false; mHomeLongPressed = false;
if (!homeWasLongPressed) { if (!homeWasLongPressed) {
try { if (mLongPressOnHomeBehavior == LONG_PRESS_HOME_RECENT_SYSTEM_UI) {
IStatusBarService statusbar = getStatusBarService(); try {
if (statusbar != null) { IStatusBarService statusbar = getStatusBarService();
statusbar.cancelPreloadRecentApps(); if (statusbar != null) {
statusbar.cancelPreloadRecentApps();
}
} catch (RemoteException e) {
Slog.e(TAG, "RemoteException when showing recent apps", e);
// re-acquire status bar service next time it is needed.
mStatusBarService = null;
} }
} catch (RemoteException e) {
Slog.e(TAG, "RemoteException when showing recent apps", e);
// re-acquire status bar service next time it is needed.
mStatusBarService = null;
} }
mHomePressed = false; mHomePressed = false;