summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Jurka <mikejurka@google.com> 2012-04-13 09:32:47 -0700
committer Michael Jurka <mikejurka@google.com> 2012-08-16 00:16:25 -0700
commit01de93de1e2a72bb530b6eeaccad59d100970f37 (patch)
tree5d5ba66f69b072242760a52f1bd72fc568ce953a
parent32e7bd9fe1343e365dc40c8d215b0d98df99a2de (diff)
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)
-rwxr-xr-xpolicy/src/com/android/internal/policy/impl/PhoneWindowManager.java18
1 files 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 c036e1b94835..1324fc3bcf8b 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;