Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add permission check for TvPipNotification" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-19 16:55:21 +00:00
committed by Android (Google) Code Review
parent efede1755e 3ebb323fe4
commit 0540a18e26
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipNotificationController.java
View File

@@ -50,6 +50,7 @@ public class TvPipNotificationController {
// Referenced in com.android.systemui.util.NotificationChannels. // Referenced in com.android.systemui.util.NotificationChannels.
public static final String NOTIFICATION_CHANNEL = "TVPIP"; public static final String NOTIFICATION_CHANNEL = "TVPIP";
private static final String NOTIFICATION_TAG = "TvPip"; private static final String NOTIFICATION_TAG = "TvPip";
private static final String SYSTEMUI_PERMISSION = "com.android.systemui.permission.SELF";
private static final String ACTION_SHOW_PIP_MENU = private static final String ACTION_SHOW_PIP_MENU =
"com.android.wm.shell.pip.tv.notification.action.SHOW_PIP_MENU"; "com.android.wm.shell.pip.tv.notification.action.SHOW_PIP_MENU";
@@ -207,7 +208,8 @@ public class TvPipNotificationController {
} }
private static PendingIntent createPendingIntent(Context context, String action) { private static PendingIntent createPendingIntent(Context context, String action) {
return PendingIntent.getBroadcast(context, 0, new Intent(action), return PendingIntent.getBroadcast(context, 0,
new Intent(action).setPackage(context.getPackageName()),
PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE); PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
} }
@@ -223,7 +225,7 @@ public class TvPipNotificationController {
void register() { void register() {
if (mRegistered) return; if (mRegistered) return;
mContext.registerReceiverForAllUsers(this, mIntentFilter, null /* permission */, mContext.registerReceiverForAllUsers(this, mIntentFilter, SYSTEMUI_PERMISSION,
mMainHandler); mMainHandler);
mRegistered = true; mRegistered = true;
} }