Merge "Revert "Mark various SysUI PendingIntent sends "interactive""" (c6d238d2) · Commits · e / os / android_frameworks_base

core/java/android/app/PendingIntent.java

+0 −14

Original line number	Diff line number	Diff line
		@@ -832,20 +832,6 @@ public final class PendingIntent implements Parcelable {
		send(context, code, intent, null, null, null, null);
		}

		/**
		* Perform the operation associated with this PendingIntent, supplying additional
		* options for the operation.
		*
		* @param options Additional options the caller would like to provide to modify the
		* sending behavior. May be built from an {@link ActivityOptions} to apply to an
		* activity start.
		*
		* @hide
		*/
		public void send(Bundle options) throws CanceledException {
		send(null, 0, null, null, null, null, options);
		}

		/**
		* Perform the operation associated with this PendingIntent, allowing the
		* caller to be notified when the send has completed.

+1 −4

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.systemui.plugins;

		import android.annotation.Nullable;
		import android.app.BroadcastOptions;
		import android.app.PendingIntent;
		import android.graphics.drawable.Drawable;
		import android.view.View;
		@@ -71,9 +70,7 @@ public interface GlobalActionsPanelPlugin extends Plugin {
		/** Starts a PendingIntent, dismissing the keyguard if necessary. */
		default void startPendingIntentDismissingKeyguard(PendingIntent pendingIntent) {
		try {
		BroadcastOptions options = BroadcastOptions.makeBasic();
		options.setInteractive(true);
		pendingIntent.send(options.toBundle());
		pendingIntent.send();
		} catch (PendingIntent.CanceledException e) {
		// no-op
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -156,8 +156,6 @@ class DetailDialog(
		// Remove the task explicitly, since onRelease() callback will be executed after
		// startActivity() below is called.
		broadcastSender.closeSystemDialogs()
		// not sent as interactive, lest the higher-importance activity launch
		// be impacted
		pendingIntent.send()
		false
		}

+1 −4

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.systemui.media.controls.pipeline

		import android.app.BroadcastOptions
		import android.app.Notification
		import android.app.Notification.EXTRA_SUBSTITUTE_APP_NAME
		import android.app.PendingIntent
		@@ -1150,9 +1149,7 @@ class MediaDataManager(

		private fun sendPendingIntent(intent: PendingIntent): Boolean {
		return try {
		val options = BroadcastOptions.makeBasic()
		options.setInteractive(true)
		intent.send(options.toBundle())
		intent.send()
		true
		} catch (e: PendingIntent.CanceledException) {
		Log.d(TAG, "Intent canceled", e)

+2 −6

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import static com.android.systemui.media.controls.models.recommendation.Smartspa
		import android.animation.Animator;
		import android.animation.AnimatorInflater;
		import android.animation.AnimatorSet;
		import android.app.BroadcastOptions;
		import android.app.PendingIntent;
		import android.app.WallpaperColors;
		import android.app.smartspace.SmartspaceAction;
		@@ -114,8 +113,6 @@ import com.android.systemui.util.ColorUtilKt;
		import com.android.systemui.util.animation.TransitionLayout;
		import com.android.systemui.util.time.SystemClock;

		import dagger.Lazy;

		import java.net.URISyntaxException;
		import java.util.ArrayList;
		import java.util.List;
		@@ -123,6 +120,7 @@ import java.util.concurrent.Executor;

		import javax.inject.Inject;

		import dagger.Lazy;
		import kotlin.Unit;

		/**
		@@ -623,9 +621,7 @@ public class MediaControlPanel {
		device.getIntent().getIntent(), true);
		} else {
		try {
		BroadcastOptions options = BroadcastOptions.makeBasic();
		options.setInteractive(true);
		device.getIntent().send(options.toBundle());
		device.getIntent().send();
		} catch (PendingIntent.CanceledException e) {
		Log.e(TAG, "Device pending intent was canceled");
		}