summaryrefslogtreecommitdiffstats
path: root/policy/src
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-02-21 16:46:22 -0800
committerCraig Mautner <cmautner@google.com>2014-02-21 16:46:22 -0800
commit42bf39edbdad19f51497938d0a3469dd772f19e8 (patch)
treee7788304a9019d8772ee462a80c122965d8b5d6d /policy/src
parentfd8a8ccbb79b3d83bb328d64c544c59251eef151 (diff)
downloadframeworks_base-42bf39edbdad19f51497938d0a3469dd772f19e8.zip
frameworks_base-42bf39edbdad19f51497938d0a3469dd772f19e8.tar.gz
frameworks_base-42bf39edbdad19f51497938d0a3469dd772f19e8.tar.bz2
Reset deferred task removal when app token added.
A task is scheduled for deletion after the final activity has been removed and has animated away. But if another activity is then added to the task the deletion flag must be reset. Also added improved debugging. Fixes bug 12987986. Change-Id: I207ea6e9592a9e036d67aa5d1465b4acc5bdd120
Diffstat (limited to 'policy/src')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 76f29cd..e38db58 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1672,7 +1672,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return view.getParent() != null ? view : null;
} catch (WindowManager.BadTokenException e) {
// ignore
- Log.w(TAG, appToken + " already running, starting window not displayed");
+ Log.w(TAG, appToken + " already running, starting window not displayed. " +
+ e.getMessage());
} catch (RuntimeException e) {
// don't crash if something else bad happens, for example a
// failure loading resources because we are loading from an app