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

Commit 895fa882 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... 

Merge "Fix silent errors when launching Keyboard Shortcuts from Settings" into nyc-dev am: bcedd6b7 am: c56ff7d5
am: ce4c2d2c

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

Change-Id: Iab2340d0276cfc9adb1c0529f3016a655a898d79
parents 4c0fc58b ce4c2d2c

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)) {