From 5d9f23f40661a56bfaf2316d281b434e274f69b4 Mon Sep 17 00:00:00 2001 From: Jacob Hobbie Date: Tue, 5 Oct 2021 13:25:07 -0700 Subject: [PATCH] Add flags to permission protected SysUI broadcasts Since these receivers are permission protected, their callers will also need the permission which already restricts access, and marking dynamic receivers that are permission protected as exported is consistent with the pattern in static receivers. Test: no-op Bug: 161145287 Change-Id: I8a155551d306ee2a7213125e69a561232bf72bae --- .../Shell/src/com/android/wm/shell/pip/PipMediaController.java | 2 +- .../src/com/android/systemui/accessibility/SystemActions.java | 3 ++- .../src/com/android/systemui/demomode/DemoModeController.kt | 2 +- .../com/android/systemui/power/PowerNotificationWarnings.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java index 97139626a3d28..8a50f22335738 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipMediaController.java @@ -144,7 +144,7 @@ public class PipMediaController { mediaControlFilter.addAction(ACTION_NEXT); mediaControlFilter.addAction(ACTION_PREV); mContext.registerReceiverForAllUsers(mMediaActionReceiver, mediaControlFilter, - SYSTEMUI_PERMISSION, mainHandler); + SYSTEMUI_PERMISSION, mainHandler, Context.RECEIVER_EXPORTED); // Creates the standard media buttons that we may show. mPauseAction = getDefaultRemoteAction(R.string.pip_pause, diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java b/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java index 2f88291d1994d..294d1f42305ad 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java @@ -174,7 +174,8 @@ public class SystemActions extends SystemUI { mReceiver, mReceiver.createIntentFilter(), PERMISSION_SELF, - null); + null, + Context.RECEIVER_EXPORTED); registerActions(); } diff --git a/packages/SystemUI/src/com/android/systemui/demomode/DemoModeController.kt b/packages/SystemUI/src/com/android/systemui/demomode/DemoModeController.kt index ed11db52b95ca..f58d6285dc407 100644 --- a/packages/SystemUI/src/com/android/systemui/demomode/DemoModeController.kt +++ b/packages/SystemUI/src/com/android/systemui/demomode/DemoModeController.kt @@ -81,7 +81,7 @@ class DemoModeController constructor( val demoFilter = IntentFilter() demoFilter.addAction(ACTION_DEMO) context.registerReceiverAsUser(broadcastReceiver, UserHandle.ALL, demoFilter, - android.Manifest.permission.DUMP, null) + android.Manifest.permission.DUMP, null, Context.RECEIVER_EXPORTED) } override fun addCallback(listener: DemoMode) { diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java index 8c66ba32ec798..4e1e1cd23c140 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerNotificationWarnings.java @@ -749,7 +749,7 @@ public class PowerNotificationWarnings implements PowerUI.WarningsUI { filter.addAction(ACTION_AUTO_SAVER_NO_THANKS); filter.addAction(ACTION_DISMISS_AUTO_SAVER_SUGGESTION); mContext.registerReceiverAsUser(this, UserHandle.ALL, filter, - android.Manifest.permission.DEVICE_POWER, mHandler); + android.Manifest.permission.DEVICE_POWER, mHandler, Context.RECEIVER_EXPORTED); } @Override