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

Merge "Fix clone method for ActivityOptions"

Browse Source
This commit is contained in:
Achim Thesmann
2023-01-26 17:20:53 +00:00
committed by Android (Google) Code Review
parent 7cc5f43876 0b2ee80a7e
commit c76e3b50b1
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1997,10 +1997,12 @@ public class ActivityOptions extends ComponentOptions {
/**
* Sets background activity launch logic won't use pending intent creator foreground state.
*
* @hide
*/
public void setIgnorePendingIntentCreatorForegroundState(boolean state) {
public ActivityOptions setIgnorePendingIntentCreatorForegroundState(boolean state) {
mIgnorePendingIntentCreatorForegroundState = state;
return this;
}
/**

6
services/core/java/com/android/server/wm/SafeActivityOptions.java
View File

@@ -143,7 +143,11 @@ public class SafeActivityOptions {
.setLaunchTaskDisplayArea(options.getLaunchTaskDisplayArea())
.setLaunchDisplayId(options.getLaunchDisplayId())
.setCallerDisplayId(options.getCallerDisplayId())
.setLaunchRootTask(options.getLaunchRootTask());
.setLaunchRootTask(options.getLaunchRootTask())
.setPendingIntentBackgroundActivityStartMode(
options.getPendingIntentBackgroundActivityStartMode())
.setIgnorePendingIntentCreatorForegroundState(
options.getIgnorePendingIntentCreatorForegroundState());
}
/**