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

Merge "Only allow NEW_TASK flag when adjusting pending intents" into qt-dev

Browse Source
This commit is contained in:
Winson Chung
2023-04-19 07:24:18 +00:00
committed by Android (Google) Code Review
parent ba8c9b4f2d c62d2e1021
commit a082fd92a4
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/ActivityOptions.java
View File

@@ -20,6 +20,8 @@ import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIO
import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT; import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.content.Intent.FLAG_RECEIVER_FOREGROUND;
import static android.view.Display.INVALID_DISPLAY; import static android.view.Display.INVALID_DISPLAY;
import android.annotation.Nullable; import android.annotation.Nullable;
@@ -1263,7 +1265,9 @@ public class ActivityOptions {
* @hide * @hide
*/ */
public int getPendingIntentLaunchFlags() { public int getPendingIntentLaunchFlags() {
return mPendingIntentLaunchFlags; // b/243794108: Ignore all flags except the new task flag, to be reconsidered in b/254490217
return mPendingIntentLaunchFlags &
(FLAG_ACTIVITY_NEW_TASK | FLAG_RECEIVER_FOREGROUND);
} }
/** /**