Add BAL permission to PendingIntent Bug: 372488487 Test: manual Flag: EXEMPT bugfix Change-Id: I70dff1a7777741ed3803826f80e4a2bd70620387
diff --git a/car-qc-lib/src/com/android/car/qc/view/QCRowView.java b/car-qc-lib/src/com/android/car/qc/view/QCRowView.java index acbdc70..7678930 100644 --- a/car-qc-lib/src/com/android/car/qc/view/QCRowView.java +++ b/car-qc-lib/src/com/android/car/qc/view/QCRowView.java
@@ -21,6 +21,7 @@ import static com.android.car.qc.QCItem.QC_TYPE_ACTION_SWITCH; import static com.android.car.qc.view.QCView.QCActionListener; +import android.app.ActivityOptions; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; @@ -464,7 +465,14 @@ if (!item.isEnabled()) { if (item.getDisabledClickAction() != null) { try { - item.getDisabledClickAction().send(getContext(), 0, intent); + item.getDisabledClickAction().send(getContext(), 0, intent, + /* requestCode= */ null, + /* fillInIntent= */ null, + /* options= */ null, + ActivityOptions.makeBasic() + .setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED) + .toBundle()); if (mActionListener != null) { mActionListener.onQCAction(item, item.getDisabledClickAction()); } @@ -482,7 +490,14 @@ if (item.getPrimaryAction() != null) { try { - item.getPrimaryAction().send(getContext(), 0, intent); + item.getPrimaryAction().send(getContext(), 0, intent, + /* requestCode= */ null, + /* fillInIntent= */ null, + /* options= */ null, + ActivityOptions.makeBasic() + .setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED) + .toBundle()); if (mActionListener != null) { mActionListener.onQCAction(item, item.getPrimaryAction()); }
diff --git a/car-qc-lib/src/com/android/car/qc/view/QCTileView.java b/car-qc-lib/src/com/android/car/qc/view/QCTileView.java index 4173e25..af5a70e 100644 --- a/car-qc-lib/src/com/android/car/qc/view/QCTileView.java +++ b/car-qc-lib/src/com/android/car/qc/view/QCTileView.java
@@ -19,6 +19,7 @@ import static com.android.car.qc.QCItem.QC_ACTION_TOGGLE_STATE; import static com.android.car.qc.view.QCView.QCActionListener; +import android.app.ActivityOptions; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; @@ -107,7 +108,14 @@ if (!qcTile.isEnabled()) { if (qcTile.getDisabledClickAction() != null) { try { - qcTile.getDisabledClickAction().send(getContext(), 0, new Intent()); + qcTile.getDisabledClickAction().send(getContext(), 0, new Intent(), + /* requestCode= */ null, + /* fillInIntent= */ null, + /* options= */ null, + ActivityOptions.makeBasic() + .setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED) + .toBundle()); if (mActionListener != null) { mActionListener.onQCAction(qcTile, qcTile.getDisabledClickAction()); } @@ -133,7 +141,14 @@ intent.putExtra(QC_ACTION_TOGGLE_STATE, isChecked); if (qcTile.getPrimaryAction() != null) { try { - qcTile.getPrimaryAction().send(getContext(), 0, intent); + qcTile.getPrimaryAction().send(getContext(), 0, intent, + /* requestCode= */ null, + /* fillInIntent= */ null, + /* options= */ null, + ActivityOptions.makeBasic() + .setPendingIntentBackgroundActivityStartMode( + ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED) + .toBundle()); if (mActionListener != null) { mActionListener.onQCAction(qcTile, qcTile.getPrimaryAction()); }