commit bcedd6b74f717dddb2e3e37385d1b4a4e82d949a
author Clara Bayarri <clarabayarri@google.com> Thu Apr 21 14:28:57 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 21 14:28:58 2016 +0000
tree b624129c7f263d4f3b31f1c9ee9bc1997a623f5f
parent 3f4510535397bf103d0299440a0299ff8bbeec28
parent c043ebee4b4b5851898667a92fdfca34a4d64e52

Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index d7afc13..d002c15 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -17159,6 +17159,7 @@
                     || Intent.ACTION_MEDIA_SCANNER_SCAN_FILE.equals(action)
                     || Intent.ACTION_GET_PERMISSIONS_COUNT.equals(action)
                     || Intent.ACTION_GET_PERMISSIONS_PACKAGES.equals(action)
+                    || Intent.ACTION_SHOW_KEYBOARD_SHORTCUTS.equals(action)
                     || AppWidgetManager.ACTION_APPWIDGET_CONFIGURE.equals(action)
                     || AppWidgetManager.ACTION_APPWIDGET_UPDATE.equals(action)
                     || LocationManager.HIGH_POWER_REQUEST_CHANGE_ACTION.equals(action)) {