aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-11 06:44:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes crashes

Browse Source
This commit is contained in:
MrSluffy
2024-11-05 22:11:23 +08:00
parent 6caf42f021
commit 95bf5aef9f
35 changed files with 3680 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wmshell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt
View File

@@ -1377,9 +1377,9 @@ class DesktopTasksController(
launchWindowingMode = WINDOWING_MODE_FREEFORM
pendingIntentLaunchFlags =
Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK
setPendingIntentBackgroundActivityStartMode(
ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_DENIED
)
// setPendingIntentBackgroundActivityStartMode(
// ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_DENIED
// )
isPendingIntentBackgroundActivityLaunchAllowedByPermission = true
}
val wct = WindowContainerTransaction()

16
wmshell/src/com/android/wm/shell/draganddrop/DragAndDropPolicy.java
View File

@@ -264,9 +264,9 @@ public class DragAndDropPolicy {
final ActivityOptions baseActivityOpts = ActivityOptions.makeBasic();
baseActivityOpts.setDisallowEnterPictureInPictureWhileLaunching(true);
// Put BAL flags to avoid activity start aborted.
baseActivityOpts.setPendingIntentBackgroundActivityStartMode(
MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
baseActivityOpts.setPendingIntentBackgroundActivityLaunchAllowedByPermission(true);
// baseActivityOpts.setPendingIntentBackgroundActivityStartMode(
// MODE_BACKGROUND_ACTIVITY_START_ALLOWED);
// baseActivityOpts.setPendingIntentBackgroundActivityLaunchAllowedByPermission(true);
final Bundle opts = baseActivityOpts.toBundle();
if (session.appData.hasExtra(EXTRA_ACTIVITY_OPTIONS)) {
opts.putAll(session.appData.getBundleExtra(EXTRA_ACTIVITY_OPTIONS));
@@ -300,13 +300,13 @@ public class DragAndDropPolicy {
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_DRAG_AND_DROP, "Launching intent at position=%d",
position);
final ActivityOptions baseActivityOpts = ActivityOptions.makeBasic();
baseActivityOpts.setDisallowEnterPictureInPictureWhileLaunching(true);
baseActivityOpts.setPendingIntentBackgroundActivityStartMode(
MODE_BACKGROUND_ACTIVITY_START_DENIED);
// baseActivityOpts.setDisallowEnterPictureInPictureWhileLaunching(true);
// baseActivityOpts.setPendingIntentBackgroundActivityStartMode(
// MODE_BACKGROUND_ACTIVITY_START_DENIED);
// TODO(b/255649902): Rework this so that SplitScreenController can always use the options
// instead of a fillInIntent since it's assuming that the PendingIntent is mutable
baseActivityOpts.setPendingIntentLaunchFlags(FLAG_ACTIVITY_NEW_TASK
| FLAG_ACTIVITY_MULTIPLE_TASK);
// baseActivityOpts.setPendingIntentLaunchFlags(FLAG_ACTIVITY_NEW_TASK
// | FLAG_ACTIVITY_MULTIPLE_TASK);
final Bundle opts = baseActivityOpts.toBundle();
mStarter.startIntent(session.launchableIntent,