diff options
| author | Craig Mautner <cmautner@google.com> | 2014-02-21 17:52:15 -0800 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-02-21 17:52:15 -0800 |
| commit | 5eb4adcbda0ff22e48716d3cf9356a9a720475b5 (patch) | |
| tree | c90ba0b3a60dbb484a9fd36321d54ab6b9cc3962 /policy | |
| parent | 550267f72b6217f797e7f93bb312ecbe6541ff49 (diff) | |
| parent | d2794f5eb308940e73906b97eb2e2f22edfbc78e (diff) | |
| download | frameworks_base-5eb4adcbda0ff22e48716d3cf9356a9a720475b5.zip frameworks_base-5eb4adcbda0ff22e48716d3cf9356a9a720475b5.tar.gz frameworks_base-5eb4adcbda0ff22e48716d3cf9356a9a720475b5.tar.bz2 | |
resolved conflicts for merge of d2794f5e to master
Change-Id: I24339e45e5fc697abf294286e2d6b57620ed9d1a
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 3 |
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 7886f5d..abc3fb1 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1661,7 +1661,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 |