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

Commit 010ad67b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13525848 from 76f860ed to 25Q3-release 

Change-Id: I6ee7eacb6ba680e761031104d85cb543ef0ec9b4
parents d5f81ced 76f860ed

AconfigFlags.bp

+17 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ aconfig_declarations_group { 
        "android.service.controls.flags-aconfig-java",

        "android.service.dreams.flags-aconfig-java",

        "android.service.notification.flags-aconfig-java",

        "android.service.quicksettings.flags-aconfig-java",

        "android.service.quickaccesswallet.flags-aconfig-java",

        "android.service.selinux.flags-aconfig-java",

        "android.service.voice.flags-aconfig-java",
@@ -1404,6 +1405,22 @@ java_aconfig_library { 
    ],

}



// Quick Settings

aconfig_declarations {

    name: "android.service.quicksettings.flags-aconfig",

    package: "android.service.quicksettings",

    exportable: true,

    container: "system",

    srcs: ["core/java/android/service/quicksettings/flags.aconfig"],

}



java_aconfig_library {

    name: "android.service.quicksettings.flags-aconfig-java",

    aconfig_declarations: "android.service.quicksettings.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    mode: "exported",

}



// Contextual Search

aconfig_declarations {

    name: "android.app.contextualsearch.flags-aconfig",

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -4525,8 +4525,10 @@ public class AlarmManagerService extends SystemService { 
                                    mUserWakeupStore.getUserIdsToWakeup(nowELAPSED);

                            for (int i = 0; i < userIds.length; i++) {

                                if (mActivityManagerInternal.isUserRunning(userIds[i], 0)

                                        || !mActivityManagerInternal.startUserInBackground(

                                                userIds[i])) {

                                        || !mActivityManagerInternal

                                                .startUserInBackgroundTemporarily(

                                                        userIds[i],

                                                        UserWakeupStore.USER_RUN_FOR_TIME_SECS)) {

                                    mUserWakeupStore.removeUserWakeup(userIds[i]);

                                }

                            }

apex/jobscheduler/service/java/com/android/server/alarm/UserWakeupStore.java

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ public class UserWakeupStore { 
     */

    @VisibleForTesting

    static final long BUFFER_TIME_MS = TimeUnit.SECONDS.toMillis(30);



    /** When a user is being woken due to a pending alarm, for how long should it be woken up. */

    public static final int USER_RUN_FOR_TIME_SECS = (int) TimeUnit.MINUTES.toSeconds(10);

    /**

     * Maximum time deviation limit to introduce a 5-second time window for user starts.

     */

core/TEST_MAPPING

+10 −0
Original line number Diff line number Diff line
@@ -11,6 +11,16 @@ 
    }

  ],

  "wear-robolectric-postsubmit": [

    {

      "name": "ClockworkSettingsRoboTests",

      "host": true

    },

    {

      "name": "ClockworkSetupWizardRoboTests",

      "host": true

    }

  ],

  "wear-robolectric-presubmit": [

    {

      "name": "ClockworkSettingsRoboTests",

      "host": true

core/api/current.txt

+9 −0
Original line number Diff line number Diff line
@@ -8954,6 +8954,9 @@ package android.app.appfunctions { 
    method @RequiresPermission(value=android.Manifest.permission.EXECUTE_APP_FUNCTIONS, conditional=true) public void isAppFunctionEnabled(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);

    method public void isAppFunctionEnabled(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);

    method public void setAppFunctionEnabled(@NonNull String, int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,java.lang.Exception>);

    field @FlaggedApi("android.permission.flags.app_function_access_ui_enabled") public static final String ACTION_MANAGE_AGENT_APP_FUNCTION_ACCESS = "android.app.appfunctions.action.MANAGE_AGENT_APP_FUNCTION_ACCESS";

    field @FlaggedApi("android.permission.flags.app_function_access_ui_enabled") public static final String ACTION_MANAGE_APP_FUNCTION_ACCESS = "android.app.appfunctions.action.MANAGE_APP_FUNCTION_ACCESS";

    field @FlaggedApi("android.permission.flags.app_function_access_ui_enabled") public static final String ACTION_MANAGE_TARGET_APP_FUNCTION_ACCESS = "android.app.appfunctions.action.MANAGE_TARGET_APP_FUNCTION_ACCESS";

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

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

    field public static final int APP_FUNCTION_STATE_ENABLED = 1; // 0x1
@@ -42745,7 +42748,13 @@ package android.service.quicksettings { 
    method public final void unlockAndRun(Runnable);

    field public static final String ACTION_QS_TILE = "android.service.quicksettings.action.QS_TILE";

    field public static final String ACTION_QS_TILE_PREFERENCES = "android.service.quicksettings.action.QS_TILE_PREFERENCES";

    field @FlaggedApi("android.service.quicksettings.quicksettings_tile_categories") public static final String CATEGORY_ACCESSIBILITY = "android.service.quicksettings.CATEGORY_ACCESSIBILITY";

    field @FlaggedApi("android.service.quicksettings.quicksettings_tile_categories") public static final String CATEGORY_CONNECTIVITY = "android.service.quicksettings.CATEGORY_CONNECTIVITY";

    field @FlaggedApi("android.service.quicksettings.quicksettings_tile_categories") public static final String CATEGORY_DISPLAY = "android.service.quicksettings.CATEGORY_DISPLAY";

    field @FlaggedApi("android.service.quicksettings.quicksettings_tile_categories") public static final String CATEGORY_PRIVACY = "android.service.quicksettings.CATEGORY_PRIVACY";

    field @FlaggedApi("android.service.quicksettings.quicksettings_tile_categories") public static final String CATEGORY_UTILITIES = "android.service.quicksettings.CATEGORY_UTILITIES";

    field public static final String META_DATA_ACTIVE_TILE = "android.service.quicksettings.ACTIVE_TILE";

    field @FlaggedApi("android.service.quicksettings.quicksettings_tile_categories") public static final String META_DATA_TILE_CATEGORY = "android.service.quicksettings.TILE_CATEGORY";

    field public static final String META_DATA_TOGGLEABLE_TILE = "android.service.quicksettings.TOGGLEABLE_TILE";

  }