Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d925d2d authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am da910fd5: Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb 

* commit 'da910fd5':
  Handle ActivityNotFoundException in the WM policy.
parents fcf51a67 da910fd5

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+8 −1
Original line number Diff line number Diff line
@@ -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);

                        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)