diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-01-26 23:58:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 23:58:10 -0800 |
| commit | 32d35b2cfcb93288b190473c1f59fb5f3e36a796 (patch) | |
| tree | 6e91bb1a7112364cb98762514bbea3b3b76bc4ad | |
| parent | 82782446cd0ea26604fcbd22d4b7e3608f32136d (diff) | |
| parent | 9d925d2dfdb2a0bd89ff081c1693129f3bf85e77 (diff) | |
| download | frameworks_base-32d35b2cfcb93288b190473c1f59fb5f3e36a796.zip frameworks_base-32d35b2cfcb93288b190473c1f59fb5f3e36a796.tar.gz frameworks_base-32d35b2cfcb93288b190473c1f59fb5f3e36a796.tar.bz2 | |
am 9d925d2d: am da910fd5: Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb
* commit '9d925d2dfdb2a0bd89ff081c1693129f3bf85e77':
Handle ActivityNotFoundException in the WM policy.
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 9 |
1 files changed, 8 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 fd84a2a..066daa8 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1402,7 +1402,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { Intent shortcutIntent = mShortcutManager.getIntent(kcm, keyCode, metaState); if (shortcutIntent != null) { shortcutIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - mContext.startActivity(shortcutIntent); + try { + mContext.startActivity(shortcutIntent); + } catch (ActivityNotFoundException ex) { + Slog.w(TAG, "Dropping shortcut key combination because " + + "the activity to which it is registered was not found: " + + KeyEvent.keyCodeToString(mShortcutKeyPressed) + + "+" + KeyEvent.keyCodeToString(keyCode), ex); + } } else { Slog.i(TAG, "Dropping unregistered shortcut key combination: " + KeyEvent.keyCodeToString(mShortcutKeyPressed) |