From 01de93de1e2a72bb530b6eeaccad59d100970f37 Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Fri, 13 Apr 2012 09:32:47 -0700 Subject: [PATCH] Fix bug with preloading recent tasks Don't send a "cancel preloading" event to recents from PhoneWindowManager if we're not using long-press on home to invoke recents (ie phones with soft nav keys) --- .../policy/impl/PhoneWindowManager.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index c036e1b948356..1324fc3bcf8b4 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1717,15 +1717,17 @@ public class PhoneWindowManager implements WindowManagerPolicy { mHomePressed = false; mHomeLongPressed = false; if (!homeWasLongPressed) { - try { - IStatusBarService statusbar = getStatusBarService(); - if (statusbar != null) { - statusbar.cancelPreloadRecentApps(); + if (mLongPressOnHomeBehavior == LONG_PRESS_HOME_RECENT_SYSTEM_UI) { + try { + IStatusBarService statusbar = getStatusBarService(); + 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;