Merge "Bulk apply PendingIntent.FLAG_MUTABLE_UNAUDITED." (40449d81) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/src/android/app/PendingIntentPerfTest.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -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();

apct-tests/perftests/utils/src/android/perftests/utils/TestPackageInstaller.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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();
		}

core/java/android/app/Notification.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

core/tests/PackageInstallerSessions/src/android/content/pm/PackageSessionTests.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -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)

core/tests/coretests/src/android/app/NotificationTest.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);