diff options
45 files changed, 76 insertions, 75 deletions
diff --git a/apct-tests/perftests/core/src/android/app/PendingIntentPerfTest.java b/apct-tests/perftests/core/src/android/app/PendingIntentPerfTest.java index a320514dd97a..1bb98cb19965 100644 --- a/apct-tests/perftests/core/src/android/app/PendingIntentPerfTest.java +++ b/apct-tests/perftests/core/src/android/app/PendingIntentPerfTest.java @@ -62,7 +62,7 @@ public class PendingIntentPerfTest { state.resumeTiming(); final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, mIntent, - 0); + PendingIntent.FLAG_MUTABLE_UNAUDITED); state.pauseTiming(); pendingIntent.cancel(); @@ -80,11 +80,11 @@ public class PendingIntentPerfTest { while (state.keepRunning()) { state.pauseTiming(); final PendingIntent previousPendingIntent = PendingIntent.getActivity(mContext, 0, - mIntent, 0); + mIntent, PendingIntent.FLAG_MUTABLE_UNAUDITED); state.resumeTiming(); final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, mIntent, - PendingIntent.FLAG_CANCEL_CURRENT); + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); state.pauseTiming(); pendingIntent.cancel(); @@ -102,11 +102,11 @@ public class PendingIntentPerfTest { while (state.keepRunning()) { state.pauseTiming(); final PendingIntent previousPendingIntent = PendingIntent.getActivity(mContext, 0, - mIntent, 0); + mIntent, PendingIntent.FLAG_MUTABLE_UNAUDITED); state.resumeTiming(); final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, mIntent, - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); state.pauseTiming(); previousPendingIntent.cancel(); @@ -124,7 +124,7 @@ public class PendingIntentPerfTest { while (state.keepRunning()) { state.pauseTiming(); final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, - mIntent, 0); + mIntent, PendingIntent.FLAG_MUTABLE_UNAUDITED); state.resumeTiming(); pendingIntent.cancel(); diff --git a/apct-tests/perftests/utils/src/android/perftests/utils/TestPackageInstaller.java b/apct-tests/perftests/utils/src/android/perftests/utils/TestPackageInstaller.java index a433d801acaf..530dc9dce1ef 100644 --- a/apct-tests/perftests/utils/src/android/perftests/utils/TestPackageInstaller.java +++ b/apct-tests/perftests/utils/src/android/perftests/utils/TestPackageInstaller.java @@ -134,7 +134,7 @@ public class TestPackageInstaller { Intent intent = new Intent(action); PendingIntent pending = PendingIntent.getBroadcast(mContext, sessionId, intent, - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); return pending.getIntentSender(); } diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 5fbc94822d4e..f6a06f3ed5ef 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -10058,7 +10058,7 @@ public class Notification implements Parcelable * <pre class="prettyprint"> * Intent displayIntent = new Intent(context, MyDisplayActivity.class); * PendingIntent displayPendingIntent = PendingIntent.getActivity(context, - * 0, displayIntent, PendingIntent.FLAG_UPDATE_CURRENT); + * 0, displayIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); * Notification notif = new Notification.Builder(context) * .extend(new Notification.WearableExtender() * .setDisplayIntent(displayPendingIntent) diff --git a/core/tests/PackageInstallerSessions/src/android/content/pm/PackageSessionTests.kt b/core/tests/PackageInstallerSessions/src/android/content/pm/PackageSessionTests.kt index b41018902b8b..18d82afc5f75 100644 --- a/core/tests/PackageInstallerSessions/src/android/content/pm/PackageSessionTests.kt +++ b/core/tests/PackageInstallerSessions/src/android/content/pm/PackageSessionTests.kt @@ -78,7 +78,8 @@ class PackageSessionTests { } fun makeIntentSender(sessionId: Int) = PendingIntent.getBroadcast(context, sessionId, - Intent(INTENT_ACTION), PendingIntent.FLAG_UPDATE_CURRENT).intentSender + Intent(INTENT_ACTION), + PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE_UNAUDITED).intentSender fun getResult(unit: TimeUnit, timeout: Long) = results.poll(timeout, unit) diff --git a/core/tests/coretests/src/android/app/NotificationTest.java b/core/tests/coretests/src/android/app/NotificationTest.java index 109cff9a7d57..252938abffdb 100644 --- a/core/tests/coretests/src/android/app/NotificationTest.java +++ b/core/tests/coretests/src/android/app/NotificationTest.java @@ -186,8 +186,8 @@ public class NotificationTest { @Test public void allPendingIntents_recollectedAfterReusingBuilder() { - PendingIntent intent1 = PendingIntent.getActivity(mContext, 0, new Intent("test1"), 0); - PendingIntent intent2 = PendingIntent.getActivity(mContext, 0, new Intent("test2"), 0); + PendingIntent intent1 = PendingIntent.getActivity(mContext, 0, new Intent("test1"), PendingIntent.FLAG_MUTABLE_UNAUDITED); + PendingIntent intent2 = PendingIntent.getActivity(mContext, 0, new Intent("test2"), PendingIntent.FLAG_MUTABLE_UNAUDITED); Notification.Builder builder = new Notification.Builder(mContext, "channel"); builder.setContentIntent(intent1); @@ -206,7 +206,7 @@ public class NotificationTest { @Test public void allPendingIntents_containsCustomRemoteViews() { - PendingIntent intent = PendingIntent.getActivity(mContext, 0, new Intent("test"), 0); + PendingIntent intent = PendingIntent.getActivity(mContext, 0, new Intent("test"), PendingIntent.FLAG_MUTABLE_UNAUDITED); RemoteViews contentView = new RemoteViews(mContext.getPackageName(), 0 /* layoutId */); contentView.setOnClickPendingIntent(1 /* id */, intent); diff --git a/core/tests/coretests/src/android/app/activity/IntentSenderTest.java b/core/tests/coretests/src/android/app/activity/IntentSenderTest.java index 19ddb52db86e..05775bca4196 100644 --- a/core/tests/coretests/src/android/app/activity/IntentSenderTest.java +++ b/core/tests/coretests/src/android/app/activity/IntentSenderTest.java @@ -32,7 +32,7 @@ public class IntentSenderTest extends BroadcastTest { registerMyReceiver(new IntentFilter(BROADCAST_REGISTERED), PERMISSION_GRANTED); addIntermediate("after-register"); PendingIntent is = PendingIntent.getBroadcast(getContext(), 0, - makeBroadcastIntent(BROADCAST_REGISTERED), 0); + makeBroadcastIntent(BROADCAST_REGISTERED), PendingIntent.FLAG_MUTABLE_UNAUDITED); is.send(); waitForResultOrThrow(BROADCAST_TIMEOUT); is.cancel(); @@ -52,7 +52,7 @@ public class IntentSenderTest extends BroadcastTest { } }; - PendingIntent is = PendingIntent.getBroadcast(getContext(), 0, intent, 0); + PendingIntent is = PendingIntent.getBroadcast(getContext(), 0, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED); is.send(Activity.RESULT_CANCELED, finish, null); waitForResultOrThrow(BROADCAST_TIMEOUT); is.cancel(); @@ -61,7 +61,7 @@ public class IntentSenderTest extends BroadcastTest { public void testLocalReceivePermissionGranted() throws Exception { setExpectedReceivers(new String[]{RECEIVER_LOCAL}); PendingIntent is = PendingIntent.getBroadcast(getContext(), 0, - makeBroadcastIntent(BROADCAST_LOCAL_GRANTED), 0); + makeBroadcastIntent(BROADCAST_LOCAL_GRANTED), PendingIntent.FLAG_MUTABLE_UNAUDITED); is.send(); waitForResultOrThrow(BROADCAST_TIMEOUT); is.cancel(); @@ -79,7 +79,7 @@ public class IntentSenderTest extends BroadcastTest { } }; - PendingIntent is = PendingIntent.getBroadcast(getContext(), 0, intent, 0); + PendingIntent is = PendingIntent.getBroadcast(getContext(), 0, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED); is.send(Activity.RESULT_CANCELED, finish, null); waitForResultOrThrow(BROADCAST_TIMEOUT); is.cancel(); diff --git a/core/tests/coretests/src/android/service/settings/suggestions/SuggestionTest.java b/core/tests/coretests/src/android/service/settings/suggestions/SuggestionTest.java index 8c47fcbc8947..6186192daf32 100644 --- a/core/tests/coretests/src/android/service/settings/suggestions/SuggestionTest.java +++ b/core/tests/coretests/src/android/service/settings/suggestions/SuggestionTest.java @@ -48,7 +48,7 @@ public class SuggestionTest { public void setUp() { final Context context = InstrumentationRegistry.getContext(); mTestIntent = PendingIntent.getActivity(context, 0 /* requestCode */, - new Intent(), 0 /* flags */); + new Intent(), PendingIntent.FLAG_MUTABLE_UNAUDITED /* flags */); mIcon = Icon.createWithBitmap(Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888)); } diff --git a/core/tests/coretests/src/android/view/textclassifier/ConversationActionTest.java b/core/tests/coretests/src/android/view/textclassifier/ConversationActionTest.java index 6b6263560e02..07eeae009b80 100644 --- a/core/tests/coretests/src/android/view/textclassifier/ConversationActionTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/ConversationActionTest.java @@ -39,7 +39,7 @@ public final class ConversationActionTest { @Test public void toBuilder() { final Context context = InstrumentationRegistry.getTargetContext(); - final PendingIntent intent = PendingIntent.getActivity(context, 0, new Intent(), 0); + final PendingIntent intent = PendingIntent.getActivity(context, 0, new Intent(), PendingIntent.FLAG_MUTABLE_UNAUDITED); final Icon icon = Icon.createWithData(new byte[]{0}, 0, 1); final Bundle extras = new Bundle(); extras.putInt("key", 5); diff --git a/core/tests/coretests/src/android/view/textclassifier/TextClassificationTest.java b/core/tests/coretests/src/android/view/textclassifier/TextClassificationTest.java index cf742b022ece..db62e171c590 100644 --- a/core/tests/coretests/src/android/view/textclassifier/TextClassificationTest.java +++ b/core/tests/coretests/src/android/view/textclassifier/TextClassificationTest.java @@ -79,7 +79,7 @@ public class TextClassificationTest { final String primaryDescription = "primaryDescription"; final Intent primaryIntent = new Intent("primaryIntentAction"); final PendingIntent primaryPendingIntent = PendingIntent.getActivity(context, 0, - primaryIntent, 0); + primaryIntent, PendingIntent.FLAG_MUTABLE_UNAUDITED); final RemoteAction remoteAction0 = new RemoteAction(primaryIcon, primaryLabel, primaryDescription, primaryPendingIntent); @@ -88,7 +88,7 @@ public class TextClassificationTest { final String secondaryDescription = "secondaryDescription"; final Intent secondaryIntent = new Intent("secondaryIntentAction"); final PendingIntent secondaryPendingIntent = PendingIntent.getActivity(context, 0, - secondaryIntent, 0); + secondaryIntent, PendingIntent.FLAG_MUTABLE_UNAUDITED); final RemoteAction remoteAction1 = new RemoteAction(secondaryIcon, secondaryLabel, secondaryDescription, secondaryPendingIntent); @@ -156,7 +156,7 @@ public class TextClassificationTest { final int iconColor = Color.RED; final String label = "label"; final PendingIntent pendingIntent = PendingIntent.getActivity( - context, 0, new Intent("ACTION_0"), 0); + context, 0, new Intent("ACTION_0"), PendingIntent.FLAG_MUTABLE_UNAUDITED); final RemoteAction remoteAction = new RemoteAction( generateTestIcon(width, height, iconColor), label, @@ -239,7 +239,7 @@ public class TextClassificationTest { .setIntent(new Intent("action")) .setOnClickListener(view -> { }) .addAction(new RemoteAction(icon1, "title1", "desc1", - PendingIntent.getActivity(context, 0, new Intent("action1"), 0))) + PendingIntent.getActivity(context, 0, new Intent("action1"), PendingIntent.FLAG_MUTABLE_UNAUDITED))) .addAction(new RemoteAction(icon1, "title2", "desc2", PendingIntent.getActivity(context, 0, new Intent("action2"), 0))) .setEntityType(TextClassifier.TYPE_EMAIL, 0.5f) diff --git a/core/tests/coretests/src/android/widget/RemoteViewsTest.java b/core/tests/coretests/src/android/widget/RemoteViewsTest.java index 8cb7e1b95245..059c764213bc 100644 --- a/core/tests/coretests/src/android/widget/RemoteViewsTest.java +++ b/core/tests/coretests/src/android/widget/RemoteViewsTest.java @@ -406,7 +406,7 @@ public class RemoteViewsTest { RemoteViews views = new RemoteViews(mPackage, R.layout.remote_views_test); for (int i = 1; i < 10; i++) { PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, - new Intent("android.widget.RemoteViewsTest_" + i), PendingIntent.FLAG_ONE_SHOT); + new Intent("android.widget.RemoteViewsTest_" + i), PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_MUTABLE_UNAUDITED); views.setOnClickPendingIntent(i, pi); } try { @@ -422,7 +422,7 @@ public class RemoteViewsTest { RemoteViews views = new RemoteViews(mPackage, R.layout.remote_views_test); PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, - new Intent("test"), PendingIntent.FLAG_ONE_SHOT); + new Intent("test"), PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_MUTABLE_UNAUDITED); views.setOnClickPendingIntent(1, pi); RemoteViews withCookie = parcelAndRecreateWithPendingIntentCookie(views, whitelistToken); @@ -454,7 +454,7 @@ public class RemoteViewsTest { RemoteViews views = new RemoteViews(mPackage, R.layout.remote_views_test); PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, new Intent("android.widget.RemoteViewsTest_shared_element"), - PendingIntent.FLAG_ONE_SHOT); + PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_MUTABLE_UNAUDITED); views.setOnClickResponse(R.id.image, RemoteViews.RemoteResponse.fromPendingIntent(pi) .addSharedElement(0, "e0") .addSharedElement(1, "e1") diff --git a/core/tests/notificationtests/src/android/app/NotificationStressTest.java b/core/tests/notificationtests/src/android/app/NotificationStressTest.java index f1740148ead6..e5000a43c47a 100644 --- a/core/tests/notificationtests/src/android/app/NotificationStressTest.java +++ b/core/tests/notificationtests/src/android/app/NotificationStressTest.java @@ -111,7 +111,7 @@ public class NotificationStressTest extends InstrumentationTestCase { private void sendNotification(int id, CharSequence text) { // Fill in arbitrary content Intent intent = new Intent(Intent.ACTION_VIEW); - PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, 0); + PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED); CharSequence title = text + " " + id; CharSequence subtitle = String.valueOf(System.currentTimeMillis()); // Create "typical" notification with random icon diff --git a/libs/usb/tests/AccessoryChat/src/com/android/accessorychat/AccessoryChat.java b/libs/usb/tests/AccessoryChat/src/com/android/accessorychat/AccessoryChat.java index bf0cef01ac7b..18cfce528205 100644 --- a/libs/usb/tests/AccessoryChat/src/com/android/accessorychat/AccessoryChat.java +++ b/libs/usb/tests/AccessoryChat/src/com/android/accessorychat/AccessoryChat.java @@ -83,7 +83,7 @@ public class AccessoryChat extends Activity implements Runnable, TextView.OnEdit super.onCreate(savedInstanceState); mUsbManager = (UsbManager) getSystemService(Context.USB_SERVICE); - mPermissionIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), 0); + mPermissionIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_MUTABLE_UNAUDITED); IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION); registerReceiver(mUsbReceiver, filter); diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java index 60a00529cb5d..8d47ed16ae79 100644 --- a/media/java/android/media/RemoteControlClient.java +++ b/media/java/android/media/RemoteControlClient.java @@ -48,7 +48,7 @@ import android.util.Log; * // build the PendingIntent for the remote control client * Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON); * mediaButtonIntent.setComponent(myEventReceiver); - * PendingIntent mediaPendingIntent = PendingIntent.getBroadcast(getApplicationContext(), 0, mediaButtonIntent, 0); + * PendingIntent mediaPendingIntent = PendingIntent.getBroadcast(getApplicationContext(), 0, mediaButtonIntent, PendingIntent.FLAG_MUTABLE_UNAUDITED); * // create and register the remote control client * RemoteControlClient myRemoteControlClient = new RemoteControlClient(mediaPendingIntent); * myAudioManager.registerRemoteControlClient(myRemoteControlClient);</pre> diff --git a/media/lib/remotedisplay/java/com/android/media/remotedisplay/RemoteDisplayProvider.java b/media/lib/remotedisplay/java/com/android/media/remotedisplay/RemoteDisplayProvider.java index 7017e444d717..5005c46c47a8 100644 --- a/media/lib/remotedisplay/java/com/android/media/remotedisplay/RemoteDisplayProvider.java +++ b/media/lib/remotedisplay/java/com/android/media/remotedisplay/RemoteDisplayProvider.java @@ -296,7 +296,7 @@ public abstract class RemoteDisplayProvider { | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED | Intent.FLAG_ACTIVITY_CLEAR_TOP); mSettingsPendingIntent = PendingIntent.getActivity( - mContext, 0, settingsIntent, 0, null); + mContext, 0, settingsIntent, PendingIntent.FLAG_MUTABLE_UNAUDITED, null); } return mSettingsPendingIntent; } diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CarrierActionUtils.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CarrierActionUtils.java index cb062a63541e..6e49b05fd273 100644 --- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CarrierActionUtils.java +++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CarrierActionUtils.java @@ -171,7 +171,7 @@ public class CarrierActionUtils { portalIntent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, portalIntent, - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); Notification notification = getNotification(context, R.string.portal_notification_id, R.string.portal_notification_detail, pendingIntent); try { diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java index 4d1fb38329e9..6d67f2147d37 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/plugins/PluginManagerImpl.java @@ -257,7 +257,7 @@ public class PluginManagerImpl extends BroadcastReceiver implements PluginManage .setContentText("Restart SysUI for changes to take effect."); Intent i = new Intent("com.android.systemui.action.RESTART").setData( Uri.parse("package://" + pkg)); - PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, i, 0); + PendingIntent pi = PendingIntent.getBroadcast(mContext, 0, i, PendingIntent.FLAG_MUTABLE_UNAUDITED); nb.addAction(new Action.Builder(null, "Restart SysUI", pi).build()); mContext.getSystemService(NotificationManager.class) .notify(SystemMessage.NOTE_PLUGIN, nb.build()); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java b/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java index fe641427cb31..26c227dc8929 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java @@ -118,7 +118,7 @@ class KeyguardEsimArea extends Button implements View.OnClickListener { mContext, 0 /* requestCode */, intent, - PendingIntent.FLAG_UPDATE_CURRENT, UserHandle.SYSTEM); + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED, UserHandle.SYSTEM); mEuiccManager .switchToSubscription(SubscriptionManager.INVALID_SUBSCRIPTION_ID, callbackIntent); } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index c6bfcbaae188..f79b9910fff4 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -1040,7 +1040,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { lockIntent.putExtra(Intent.EXTRA_USER_ID, profileId); lockIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); PendingIntent lockSender = PendingIntent.getBroadcast( - mContext, 0, lockIntent, PendingIntent.FLAG_CANCEL_CURRENT); + mContext, 0, lockIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); mAlarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, userWhen, lockSender); } diff --git a/packages/SystemUI/src/com/android/systemui/media/ResumeMediaBrowser.java b/packages/SystemUI/src/com/android/systemui/media/ResumeMediaBrowser.java index a4d44367be73..e453653cf7b5 100644 --- a/packages/SystemUI/src/com/android/systemui/media/ResumeMediaBrowser.java +++ b/packages/SystemUI/src/com/android/systemui/media/ResumeMediaBrowser.java @@ -242,7 +242,7 @@ public class ResumeMediaBrowser { public PendingIntent getAppIntent() { PackageManager pm = mContext.getPackageManager(); Intent launchIntent = pm.getLaunchIntentForPackage(mComponentName.getPackageName()); - return PendingIntent.getActivity(mContext, 0, launchIntent, 0); + return PendingIntent.getActivity(mContext, 0, launchIntent, PendingIntent.FLAG_MUTABLE_UNAUDITED); } /** diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotNotificationsController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotNotificationsController.java index db5a4941ca58..6cdf6ab5154e 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotNotificationsController.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotNotificationsController.java @@ -82,7 +82,7 @@ public class ScreenshotNotificationsController { dpm.createAdminSupportIntent(DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE); if (intent != null) { final PendingIntent pendingIntent = PendingIntent.getActivityAsUser( - mContext, 0, intent, 0, null, UserHandle.CURRENT); + mContext, 0, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED, null, UserHandle.CURRENT); b.setContentIntent(pendingIntent); } diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 5ce630e3daed..fa7b7a784667 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -1353,7 +1353,7 @@ public final class ActiveServices { .setContentText(msg) .setContentIntent( PendingIntent.getActivityAsUser(context, 0, intent, - PendingIntent.FLAG_UPDATE_CURRENT, + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED, null, new UserHandle(smap.mUserId))); nm.notifyAsUser(null, SystemMessageProto.SystemMessage.NOTE_FOREGROUND_SERVICES, n.build(), new UserHandle(smap.mUserId)); diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index f7f34407b867..9f351a3c3c0d 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -643,7 +643,7 @@ public class LockSettingsService extends ILockSettings.Stub { unlockIntent.setFlags( Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); PendingIntent intent = PendingIntent.getActivity(mContext, 0, unlockIntent, - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); showEncryptionNotification(user, title, message, detail, intent); } diff --git a/services/core/java/com/android/server/notification/CountdownConditionProvider.java b/services/core/java/com/android/server/notification/CountdownConditionProvider.java index c165fc13cc52..d04aac2f5717 100644 --- a/services/core/java/com/android/server/notification/CountdownConditionProvider.java +++ b/services/core/java/com/android/server/notification/CountdownConditionProvider.java @@ -118,7 +118,7 @@ public class CountdownConditionProvider extends SystemConditionProviderService { .putExtra(EXTRA_CONDITION_ID, conditionId) .setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); final PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, REQUEST_CODE, - intent, PendingIntent.FLAG_UPDATE_CURRENT); + intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); alarms.cancel(pendingIntent); if (mTime > 0) { final long now = System.currentTimeMillis(); diff --git a/services/core/java/com/android/server/notification/NotificationShellCmd.java b/services/core/java/com/android/server/notification/NotificationShellCmd.java index 78c60d559ea9..7112ae16c363 100644 --- a/services/core/java/com/android/server/notification/NotificationShellCmd.java +++ b/services/core/java/com/android/server/notification/NotificationShellCmd.java @@ -527,14 +527,14 @@ public class NotificationShellCmd extends ShellCommand { final PendingIntent pi; if ("broadcast".equals(intentKind)) { pi = PendingIntent.getBroadcastAsUser( - context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT, + context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED, UserHandle.CURRENT); } else if ("service".equals(intentKind)) { pi = PendingIntent.getService( - context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT); + context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); } else { pi = PendingIntent.getActivityAsUser( - context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT, null, + context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED, null, UserHandle.CURRENT); } builder.setContentIntent(pi); diff --git a/services/core/java/com/android/server/policy/BurnInProtectionHelper.java b/services/core/java/com/android/server/policy/BurnInProtectionHelper.java index 6886985eec50..c1744d821624 100644 --- a/services/core/java/com/android/server/policy/BurnInProtectionHelper.java +++ b/services/core/java/com/android/server/policy/BurnInProtectionHelper.java @@ -114,7 +114,7 @@ public class BurnInProtectionHelper implements DisplayManager.DisplayListener, intent.setPackage(context.getPackageName()); intent.setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); mBurnInProtectionIntent = PendingIntent.getBroadcast(context, 0, - intent, PendingIntent.FLAG_UPDATE_CURRENT); + intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); DisplayManager displayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE); mDisplay = displayManager.getDisplay(Display.DEFAULT_DISPLAY); diff --git a/services/core/java/com/android/server/trust/TrustAgentWrapper.java b/services/core/java/com/android/server/trust/TrustAgentWrapper.java index 46143558eed7..5f6fff138789 100644 --- a/services/core/java/com/android/server/trust/TrustAgentWrapper.java +++ b/services/core/java/com/android/server/trust/TrustAgentWrapper.java @@ -149,7 +149,7 @@ public class TrustAgentWrapper { } long expiration = SystemClock.elapsedRealtime() + duration; mAlarmPendingIntent = PendingIntent.getBroadcast(mContext, 0, mAlarmIntent, - PendingIntent.FLAG_CANCEL_CURRENT); + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, expiration, mAlarmPendingIntent); } diff --git a/services/core/java/com/android/server/utils/ManagedApplicationService.java b/services/core/java/com/android/server/utils/ManagedApplicationService.java index c5553881cf6c..c103e0e60696 100644 --- a/services/core/java/com/android/server/utils/ManagedApplicationService.java +++ b/services/core/java/com/android/server/utils/ManagedApplicationService.java @@ -304,7 +304,7 @@ public class ManagedApplicationService { } if (mSettingsAction != null) { intent.putExtra(Intent.EXTRA_CLIENT_INTENT, - PendingIntent.getActivity(mContext, 0, new Intent(mSettingsAction), 0)); + PendingIntent.getActivity(mContext, 0, new Intent(mSettingsAction), PendingIntent.FLAG_MUTABLE_UNAUDITED)); } mConnection = new ServiceConnection() { diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java index 839bc93ba00f..df8a720d59b9 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java @@ -67,7 +67,7 @@ public class AccessibilityManagerServiceTest extends AndroidTestCase { private static final String INTENT_ACTION = "TESTACTION"; private static final String DESCRIPTION = "description"; private static final PendingIntent TEST_PENDING_INTENT = PendingIntent.getBroadcast( - InstrumentationRegistry.getTargetContext(), 0, new Intent(INTENT_ACTION), 0); + InstrumentationRegistry.getTargetContext(), 0, new Intent(INTENT_ACTION), PendingIntent.FLAG_MUTABLE_UNAUDITED); private static final RemoteAction TEST_ACTION = new RemoteAction( Icon.createWithContentUri("content://test"), LABEL, diff --git a/services/tests/servicestests/src/com/android/server/accessibility/SystemActionPerformerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/SystemActionPerformerTest.java index 98f476464842..8b6b7c235c44 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/SystemActionPerformerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/SystemActionPerformerTest.java @@ -76,14 +76,14 @@ public class SystemActionPerformerTest { private static final String DESCRIPTION1 = "description1"; private static final String DESCRIPTION2 = "description2"; private static final PendingIntent TEST_PENDING_INTENT_1 = PendingIntent.getBroadcast( - InstrumentationRegistry.getTargetContext(), 0, new Intent(INTENT_ACTION1), 0); + InstrumentationRegistry.getTargetContext(), 0, new Intent(INTENT_ACTION1), PendingIntent.FLAG_MUTABLE_UNAUDITED); private static final RemoteAction NEW_TEST_ACTION_1 = new RemoteAction( Icon.createWithContentUri("content://test"), LABEL_1, DESCRIPTION1, TEST_PENDING_INTENT_1); private static final PendingIntent TEST_PENDING_INTENT_2 = PendingIntent.getBroadcast( - InstrumentationRegistry.getTargetContext(), 0, new Intent(INTENT_ACTION2), 0); + InstrumentationRegistry.getTargetContext(), 0, new Intent(INTENT_ACTION2), PendingIntent.FLAG_MUTABLE_UNAUDITED); private static final RemoteAction NEW_TEST_ACTION_2 = new RemoteAction( Icon.createWithContentUri("content://test"), LABEL_2, diff --git a/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManagerTest.java b/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManagerTest.java index ac7447006444..b65e4877da50 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManagerTest.java @@ -1074,7 +1074,7 @@ public class RecoverableKeyStoreManagerTest { int uid = Binder.getCallingUid(); PendingIntent intent = PendingIntent.getBroadcast( InstrumentationRegistry.getTargetContext(), /*requestCode=*/1, - new Intent(), /*flags=*/ 0); + new Intent(), /*flags=*/ PendingIntent.FLAG_MUTABLE_UNAUDITED); mRecoverableKeyStoreManager.setSnapshotCreatedPendingIntent(intent); verify(mMockListenersStorage).setSnapshotListener(eq(uid), any(PendingIntent.class)); } diff --git a/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverySnapshotListenersStorageTest.java b/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverySnapshotListenersStorageTest.java index 33038aa18337..ea3c5facec7b 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverySnapshotListenersStorageTest.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverySnapshotListenersStorageTest.java @@ -41,7 +41,7 @@ public class RecoverySnapshotListenersStorageTest { int recoveryAgentUid = 1000; PendingIntent intent = PendingIntent.getBroadcast( InstrumentationRegistry.getTargetContext(), /*requestCode=*/ 1, - new Intent(), /*flags=*/ 0); + new Intent(), /*flags=*/ PendingIntent.FLAG_MUTABLE_UNAUDITED); mStorage.setSnapshotListener(recoveryAgentUid, intent); assertTrue(mStorage.hasListener(recoveryAgentUid)); @@ -54,7 +54,7 @@ public class RecoverySnapshotListenersStorageTest { int recoveryAgentUid = 1000; mStorage.recoverySnapshotAvailable(recoveryAgentUid); PendingIntent intent = PendingIntent.getBroadcast( - context, /*requestCode=*/ 0, new Intent(TEST_INTENT_ACTION), /*flags=*/0); + context, /*requestCode=*/ 0, new Intent(TEST_INTENT_ACTION), /*flags=*/PendingIntent.FLAG_MUTABLE_UNAUDITED); CountDownLatch latch = new CountDownLatch(1); context.registerReceiver(new BroadcastReceiver() { @Override @@ -75,7 +75,7 @@ public class RecoverySnapshotListenersStorageTest { int recoveryAgentUid = 1000; mStorage.recoverySnapshotAvailable(recoveryAgentUid); PendingIntent intent = PendingIntent.getBroadcast( - context, /*requestCode=*/ 0, new Intent(TEST_INTENT_ACTION), /*flags=*/0); + context, /*requestCode=*/ 0, new Intent(TEST_INTENT_ACTION), /*flags=*/PendingIntent.FLAG_MUTABLE_UNAUDITED); CountDownLatch latch = new CountDownLatch(2); BroadcastReceiver broadcastReceiver = new BroadcastReceiver() { @Override diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest8.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest8.java index 12e678654799..58e00f20374e 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest8.java +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest8.java @@ -324,7 +324,7 @@ public class ShortcutManagerTest8 extends BaseShortcutManagerTest { } private IntentSender makeResultIntent() { - return PendingIntent.getActivity(getTestContext(), 0, new Intent(), 0).getIntentSender(); + return PendingIntent.getActivity(getTestContext(), 0, new Intent(), PendingIntent.FLAG_MUTABLE_UNAUDITED).getIntentSender(); } public void testRequestPinShortcut_withCallback() { diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest9.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest9.java index c21a3a725837..55b4b936133d 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest9.java +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest9.java @@ -147,7 +147,7 @@ public class ShortcutManagerTest9 extends BaseShortcutManagerTest { public void testRequestPinAppWidget_withCallback() { final PendingIntent resultIntent = - PendingIntent.getActivity(getTestContext(), 0, new Intent(), 0); + PendingIntent.getActivity(getTestContext(), 0, new Intent(), PendingIntent.FLAG_MUTABLE_UNAUDITED); checkRequestPinAppWidget(resultIntent); } diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 7a21b3adf654..f1bea676ed20 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -3285,7 +3285,7 @@ public abstract class Connection extends Conferenceable { * Intent intent = new Intent(Intent.ACTION_MAIN, null); * intent.setFlags(Intent.FLAG_ACTIVITY_NO_USER_ACTION | Intent.FLAG_ACTIVITY_NEW_TASK); * intent.setClass(context, YourIncomingCallActivity.class); - * PendingIntent pendingIntent = PendingIntent.getActivity(context, 1, intent, 0); + * PendingIntent pendingIntent = PendingIntent.getActivity(context, 1, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED); * * // Build the notification as an ongoing high priority item; this ensures it will show as * // a heads up notification which slides down over top of the current content. diff --git a/telecomm/java/android/telecom/InCallService.java b/telecomm/java/android/telecom/InCallService.java index 07de61759d59..5cf8de8f9078 100644 --- a/telecomm/java/android/telecom/InCallService.java +++ b/telecomm/java/android/telecom/InCallService.java @@ -179,7 +179,7 @@ import java.util.List; * Intent intent = new Intent(Intent.ACTION_MAIN, null); * intent.setFlags(Intent.FLAG_ACTIVITY_NO_USER_ACTION | Intent.FLAG_ACTIVITY_NEW_TASK); * intent.setClass(context, YourIncomingCallActivity.class); - * PendingIntent pendingIntent = PendingIntent.getActivity(context, 1, intent, 0); + * PendingIntent pendingIntent = PendingIntent.getActivity(context, 1, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED); * * // Build the notification as an ongoing high priority item; this ensures it will show as * // a heads up notification which slides down over top of the current content. diff --git a/tests/AccessoryDisplay/sink/src/com/android/accessorydisplay/sink/SinkActivity.java b/tests/AccessoryDisplay/sink/src/com/android/accessorydisplay/sink/SinkActivity.java index fc1d47bcd20f..65b4bd090c82 100644 --- a/tests/AccessoryDisplay/sink/src/com/android/accessorydisplay/sink/SinkActivity.java +++ b/tests/AccessoryDisplay/sink/src/com/android/accessorydisplay/sink/SinkActivity.java @@ -167,7 +167,7 @@ public class SinkActivity extends Activity { Intent intent = new Intent(ACTION_USB_DEVICE_PERMISSION); intent.setPackage(getPackageName()); PendingIntent pendingIntent = PendingIntent.getBroadcast( - this, 0, intent, PendingIntent.FLAG_ONE_SHOT); + this, 0, intent, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_MUTABLE); mUsbManager.requestPermission(device, pendingIntent); return; } diff --git a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java index 768cfaea4898..a8e47b5e6def 100644 --- a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java +++ b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java @@ -100,7 +100,7 @@ public class ActivityTestMain extends Activity { Intent intent = new Intent(ActivityTestMain.this, AlarmSpamReceiver.class); intent.setAction("com.example.SPAM_ALARM=" + when); PendingIntent pi = PendingIntent.getBroadcast(ActivityTestMain.this, - 0, intent, 0); + 0, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED); mAlarm.setAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME, when+(30*1000), pi); scheduleSpamAlarm(30*1000); } break; @@ -134,7 +134,7 @@ public class ActivityTestMain extends Activity { // Also send a broadcast alarm to evaluate the alarm fast-forward policy intent.putExtra(SLOW_RECEIVER_EXTRA, 4); - PendingIntent pi = PendingIntent.getBroadcast(ActivityTestMain.this, 1, intent, 0); + PendingIntent pi = PendingIntent.getBroadcast(ActivityTestMain.this, 1, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED); AlarmManager am = (AlarmManager) getSystemService(Context.ALARM_SERVICE); long now = SystemClock.elapsedRealtime(); Log.i(TAG, "Setting alarm for now + 5 seconds"); @@ -493,7 +493,7 @@ public class ActivityTestMain extends Activity { Intent receiveIntent = new Intent(ActivityTestMain.this, TrackTimeReceiver.class); receiveIntent.putExtra("something", "yeah, this is us!"); options.requestUsageTimeReport(PendingIntent.getBroadcast(ActivityTestMain.this, - 0, receiveIntent, PendingIntent.FLAG_CANCEL_CURRENT)); + 0, receiveIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED)); startActivity(Intent.createChooser(intent, "Who do you love?"), options.toBundle()); return true; } diff --git a/tests/DozeTest/src/com/android/dreams/dozetest/DozeTestDream.java b/tests/DozeTest/src/com/android/dreams/dozetest/DozeTestDream.java index fa292bd0d57a..6985702c24e6 100644 --- a/tests/DozeTest/src/com/android/dreams/dozetest/DozeTestDream.java +++ b/tests/DozeTest/src/com/android/dreams/dozetest/DozeTestDream.java @@ -83,7 +83,7 @@ public class DozeTestDream extends DreamService { filter.addAction(intent.getAction()); registerReceiver(mAlarmReceiver, filter); mAlarmIntent = PendingIntent.getBroadcast(this, 0, intent, - PendingIntent.FLAG_CANCEL_CURRENT); + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); setDozeScreenState(DISPLAY_STATE_WHEN_DOZING); } diff --git a/tests/FrameworkPerf/src/com/android/frameworkperf/SchedulerService.java b/tests/FrameworkPerf/src/com/android/frameworkperf/SchedulerService.java index d4cbbf9c8271..11a26d6c727a 100644 --- a/tests/FrameworkPerf/src/com/android/frameworkperf/SchedulerService.java +++ b/tests/FrameworkPerf/src/com/android/frameworkperf/SchedulerService.java @@ -41,7 +41,7 @@ public class SchedulerService extends Service { new Intent(this, FrameworkPerfActivity.class) .setAction(Intent.ACTION_MAIN) .addCategory(Intent.CATEGORY_LAUNCHER) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), 0)) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), PendingIntent.FLAG_MUTABLE_UNAUDITED)) .setOngoing(true) .build(); startForeground(1, status); diff --git a/tests/OneMedia/src/com/android/onemedia/NotificationHelper.java b/tests/OneMedia/src/com/android/onemedia/NotificationHelper.java index ceb0937b9165..6483c924cd67 100644 --- a/tests/OneMedia/src/com/android/onemedia/NotificationHelper.java +++ b/tests/OneMedia/src/com/android/onemedia/NotificationHelper.java @@ -52,22 +52,22 @@ public class NotificationHelper extends BroadcastReceiver { mIntents.put(R.drawable.ic_pause, PendingIntent.getBroadcast(mService, 100, new Intent( com.android.onemedia.playback.RequestUtils.ACTION_PAUSE).setPackage(pkg), - PendingIntent.FLAG_CANCEL_CURRENT)); + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED)); mIntents.put(R.drawable.ic_play_arrow, PendingIntent.getBroadcast(mService, 100, new Intent(com.android.onemedia.playback.RequestUtils.ACTION_PLAY).setPackage(pkg), - PendingIntent.FLAG_CANCEL_CURRENT)); + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED)); mIntents.put(R.drawable.ic_skip_previous, PendingIntent.getBroadcast(mService, 100, new Intent(com.android.onemedia.playback.RequestUtils.ACTION_PREV).setPackage(pkg), - PendingIntent.FLAG_CANCEL_CURRENT)); + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED)); mIntents.put(R.drawable.ic_skip_next, PendingIntent.getBroadcast(mService, 100, new Intent(com.android.onemedia.playback.RequestUtils.ACTION_NEXT).setPackage(pkg), - PendingIntent.FLAG_CANCEL_CURRENT)); + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED)); mIntents.put(R.drawable.ic_fast_rewind, PendingIntent.getBroadcast(mService, 100, new Intent(com.android.onemedia.playback.RequestUtils.ACTION_REW).setPackage(pkg), - PendingIntent.FLAG_CANCEL_CURRENT)); + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED)); mIntents.put(R.drawable.ic_fast_forward, PendingIntent.getBroadcast(mService, 100, new Intent(com.android.onemedia.playback.RequestUtils.ACTION_FFWD).setPackage(pkg), - PendingIntent.FLAG_CANCEL_CURRENT)); + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED)); } /** diff --git a/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java b/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java index 9862116e376b..601688ed783d 100644 --- a/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java +++ b/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java @@ -497,7 +497,7 @@ public class NotificationBuilderTest extends Activity intent.setData(Uri.fromParts("content", "//status_bar_test/delete/" + id, null)); intent.putExtra(ConfirmationActivity.EXTRA_TITLE, "Delete intent"); intent.putExtra(ConfirmationActivity.EXTRA_TEXT, "id: " + id); - return PendingIntent.getActivity(this, 0, intent, 0); + return PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED); } private PendingIntent makeContentIntent(int id) { @@ -505,7 +505,7 @@ public class NotificationBuilderTest extends Activity intent.setData(Uri.fromParts("content", "//status_bar_test/content/" + id, null)); intent.putExtra(ConfirmationActivity.EXTRA_TITLE, "Content intent"); intent.putExtra(ConfirmationActivity.EXTRA_TEXT, "id: " + id); - return PendingIntent.getActivity(this, 0, intent, 0); + return PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED); } } diff --git a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java index 163250d9d666..429e676155f8 100644 --- a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java +++ b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java @@ -1160,12 +1160,12 @@ public class NotificationTestList extends TestActivity private PendingIntent makeIntent() { Intent intent = new Intent(Intent.ACTION_MAIN); intent.addCategory(Intent.CATEGORY_HOME); - return PendingIntent.getActivity(this, 0, intent, 0); + return PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED); } private PendingIntent makeIntent2() { Intent intent = new Intent(this, StatusBarTest.class); - return PendingIntent.getActivity(this, 0, intent, 0); + return PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED); } diff --git a/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java b/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java index 3d72ee67a227..6bcfebc752f1 100644 --- a/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java +++ b/tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java @@ -160,7 +160,7 @@ public class StatusBarTest extends TestActivity StatusBarTest.this, 0, fullScreenIntent, - PendingIntent.FLAG_CANCEL_CURRENT); + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED); Notification not = new Notification.Builder(StatusBarTest.this) .setSmallIcon(R.drawable.stat_sys_phone) .setWhen(System.currentTimeMillis() - (1000 * 60 * 60 * 24)) diff --git a/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageStatsActivity.java b/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageStatsActivity.java index bb985d7f8be2..53269efcbf05 100644 --- a/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageStatsActivity.java +++ b/tests/UsageStatsTest/src/com/android/tests/usagestats/UsageStatsActivity.java @@ -164,7 +164,7 @@ public class UsageStatsActivity extends ListActivity { intent.putExtra(EXTRA_KEY_TIMEOUT, true); mUsageStatsManager.registerAppUsageObserver(1, packages, 60, TimeUnit.SECONDS, PendingIntent.getActivity(UsageStatsActivity.this, - 1, intent, 0)); + 1, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED)); } } }); @@ -198,7 +198,7 @@ public class UsageStatsActivity extends ListActivity { intent.putExtra(EXTRA_KEY_TIMEOUT, true); mUsageStatsManager.registerAppUsageLimitObserver(1, packages, Duration.ofSeconds(60), Duration.ofSeconds(0), - PendingIntent.getActivity(UsageStatsActivity.this, 1, intent, 0)); + PendingIntent.getActivity(UsageStatsActivity.this, 1, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED)); } } }); diff --git a/tests/UsbHostExternalManagmentTest/AoapTestDevice/src/com/android/hardware/usb/aoapdevicetest/UsbAoapDeviceTestActivity.java b/tests/UsbHostExternalManagmentTest/AoapTestDevice/src/com/android/hardware/usb/aoapdevicetest/UsbAoapDeviceTestActivity.java index aa4f8caa0b20..ef179e2da26d 100644 --- a/tests/UsbHostExternalManagmentTest/AoapTestDevice/src/com/android/hardware/usb/aoapdevicetest/UsbAoapDeviceTestActivity.java +++ b/tests/UsbHostExternalManagmentTest/AoapTestDevice/src/com/android/hardware/usb/aoapdevicetest/UsbAoapDeviceTestActivity.java @@ -99,7 +99,7 @@ public class UsbAoapDeviceTestActivity extends Activity { Intent intent = new Intent(ACTION_USB_ACCESSORY_PERMISSION); intent.setPackage(getPackageName()); PendingIntent pendingIntent = PendingIntent.getBroadcast( - this, 0, intent, PendingIntent.FLAG_ONE_SHOT); + this, 0, intent, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_MUTABLE_UNAUDITED); mUsbManager.requestPermission(accessory, pendingIntent); return; } |