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

Commit c56ff7d5 authored by Clara Bayarri's avatar Clara Bayarri Committed by android-build-merger
Browse files

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

am: bcedd6b7

* commit 'bcedd6b7':
  Fix silent errors when launching Keyboard Shortcuts from Settings

Change-Id: I9e87e2c02187117df5e8ff587cb293e44f3b1e2c
parents eedfc545 bcedd6b7

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

+1 −0
Original line number Diff line number Diff line
@@ -17159,6 +17159,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    || 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)) {