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

Merge "Make mutable PendingIntent explicit"

Browse Source
This commit is contained in:
Azhara Assanova
2023-01-13 18:22:20 +00:00
committed by Android (Google) Code Review
parent 6b31e41e81 1efd9a0405
commit 22232aff54
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apct-tests/perftests/utils/src/android/perftests/utils/TestPackageInstaller.java
View File

@@ -133,9 +133,9 @@ public class TestPackageInstaller {
mContext.registerReceiver(this, filter,
Context.RECEIVER_EXPORTED_UNAUDITED);
Intent intent = new Intent(action);
Intent intent = new Intent(action).setPackage(mContext.getPackageName());
PendingIntent pending = PendingIntent.getBroadcast(mContext, sessionId, intent,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED);
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
return pending.getIntentSender();
}

2
packages/PackageInstaller/src/com/android/packageinstaller/wear/PackageInstallerImpl.java
View File

@@ -268,7 +268,7 @@ public class PackageInstallerImpl {
Context.RECEIVER_EXPORTED);
// Create a matching PendingIntent and use it to generate the IntentSender
Intent broadcastIntent = new Intent(action);
Intent broadcastIntent = new Intent(action).setPackage(mContext.getPackageName());
PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, packageName.hashCode(),
broadcastIntent, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT
| PendingIntent.FLAG_MUTABLE);

6
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
View File

@@ -839,7 +839,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
.setName("bubblebot")
.build();
RemoteInput remoteInput = new RemoteInput.Builder("reply_key").setLabel("reply").build();
PendingIntent inputIntent = PendingIntent.getActivity(mContext, 0, new Intent(),
PendingIntent inputIntent = PendingIntent.getActivity(mContext, 0,
new Intent().setPackage(mContext.getPackageName()),
PendingIntent.FLAG_MUTABLE);
Icon icon = Icon.createWithResource(mContext, android.R.drawable.sym_def_app_icon);
Notification.Action replyAction = new Notification.Action.Builder(icon, "Reply",
@@ -9227,7 +9228,8 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
NotificationRecord r = generateNotificationRecord(mTestNotificationChannel);
ArrayList<Notification.Action> extraAction = new ArrayList<>();
RemoteInput remoteInput = new RemoteInput.Builder("reply_key").setLabel("reply").build();
PendingIntent inputIntent = PendingIntent.getActivity(mContext, 0, new Intent(),
PendingIntent inputIntent = PendingIntent.getActivity(mContext, 0,
new Intent().setPackage(mContext.getPackageName()),
PendingIntent.FLAG_MUTABLE);
Icon icon = Icon.createWithResource(mContext, android.R.drawable.sym_def_app_icon);
Notification.Action replyAction = new Notification.Action.Builder(icon, "Reply",