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

Commit 4518750c authored by Achim Thesmann's avatar Achim Thesmann
Browse files

Fixes for new Background Activity Launch (BAL) Modes 

- Remove accidentally added @FlaggedApi
- minor fixes

Test: atest BackgroundActivityLaunchTests
Flag: com.android.window.flags.bal_additional_start_modes
Bug: 352182359, 372323271
Change-Id: I1449f4664c80b473add7f1d478391cf7db68c200
parent f6002bc0

core/api/current.txt

+1 −1
Original line number Original line 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 @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_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_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

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

  }

  }































core/java/android/app/ActivityOptions.java



+3
−4






























Original line number
Original line
Diff line number
Diff line








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









    /**







    /**











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







     * 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







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











     * <code>START_ACTIVITIES_FROM_BACKGROUND</code>.







     * <code>START_ACTIVITIES_FROM_BACKGROUND</code>.











     *







     *









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









    /**







    /**











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







     * 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;







    public static final int MODE_BACKGROUND_ACTIVITY_START_DENIED = 2;











    /**







    /**











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







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