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

Commit c7a5b7c3 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by android-build-merger
Browse files

Merge "Merge "Another intent sent by both system and apps." into nyc-dev am:... 

Merge "Merge "Another intent sent by both system and apps." into nyc-dev am: 71619aa4 am: 060676de" into nyc-mr1-dev-plus-aosp
am: dbff7eed

* commit 'dbff7eed':
  Another intent sent by both system and apps.

Change-Id: Ie5787bd0d7de37b238dbfb85456e20a9c291bbf4
parents 90fbc991 dbff7eed

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

+1 −0
Original line number Diff line number Diff line
@@ -17185,6 +17185,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
            if (isProtectedBroadcast

                    || Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)

                    || Intent.ACTION_DISMISS_KEYBOARD_SHORTCUTS.equals(action)

                    || Intent.ACTION_MEDIA_BUTTON.equals(action)

                    || Intent.ACTION_MEDIA_SCANNER_SCAN_FILE.equals(action)

                    || Intent.ACTION_SHOW_KEYBOARD_SHORTCUTS.equals(action)

                    || AppWidgetManager.ACTION_APPWIDGET_CONFIGURE.equals(action)