Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21382d60 authored by Achim Thesmann's avatar Achim Thesmann Committed by Android (Google) Code Review
Browse files

Merge "Fixes for new Background Activity Launch (BAL) Modes" into main

parents 995571f4 4518750c

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4950,7 +4950,7 @@ package android.app { 
    field @Deprecated @FlaggedApi("com.android.window.flags.bal_additional_start_modes") public static final int MODE_BACKGROUND_ACTIVITY_START_ALLOWED = 1; // 0x1

    field @FlaggedApi("com.android.window.flags.bal_additional_start_modes") public static final int MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS = 3; // 0x3

    field @FlaggedApi("com.android.window.flags.bal_additional_start_modes") public static final int MODE_BACKGROUND_ACTIVITY_START_ALLOW_IF_VISIBLE = 4; // 0x4

    field @FlaggedApi("com.android.window.flags.bal_additional_start_modes") public static final int MODE_BACKGROUND_ACTIVITY_START_DENIED = 2; // 0x2

    field public static final int MODE_BACKGROUND_ACTIVITY_START_DENIED = 2; // 0x2

    field public static final int MODE_BACKGROUND_ACTIVITY_START_SYSTEM_DEFINED = 0; // 0x0

  }

























core/java/android/app/ActivityOptions.java



+3
−4






























Original line number
Diff line number
Diff line








@@ -120,7 +120,7 @@ public class ActivityOptions extends ComponentOptions {













    /**















     * Grants the {@link PendingIntent} background activity start privileges.















     *













     * This behaves the same as {@link #MODE_BACKGROUND_ACTIVITY_START_ALLOWED_ALWAYS}, except it













     * This behaves the same as {@link #MODE_BACKGROUND_ACTIVITY_START_ALLOW_ALWAYS}, except it















     * does not grant background activity launch permissions based on the privileged permission















     * <code>START_ACTIVITIES_FROM_BACKGROUND</code>.















     *









@@ -136,7 +136,6 @@ public class ActivityOptions extends ComponentOptions {













    /**















     * Denies the {@link PendingIntent} any background activity start privileges.















     */













    @FlaggedApi(Flags.FLAG_BAL_ADDITIONAL_START_MODES)















    public static final int MODE_BACKGROUND_ACTIVITY_START_DENIED = 2;















    /**















     * Grants the {@link PendingIntent} all background activity start privileges, including