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

Commit 70c0ae96 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10915631 from d94aa06d to 24Q1-release 

Change-Id: If11e911fb533be9980d1ec2cd8f0a21be0c80de8
parents ae45c951 d94aa06d

AconfigFlags.bp

+17 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ aconfig_srcjars = [ 
    ":android.credentials.flags-aconfig-java{.generated_srcjars}",

    ":android.view.contentprotection.flags-aconfig-java{.generated_srcjars}",

    ":android.service.voice.flags-aconfig-java{.generated_srcjars}",

    ":android.service.autofill.flags-aconfig-java{.generated_srcjars}",

]



filegroup {
@@ -416,3 +417,19 @@ java_aconfig_library { 
    aconfig_declarations: "android.service.voice.flags-aconfig",

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

}



// Autofill

aconfig_declarations {

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

    package: "android.service.autofill",

    srcs: [

        "services/autofill/bugfixes.aconfig",

        "services/autofill/features.aconfig"

    ],

}



java_aconfig_library {

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

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

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

}

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+95 −4
Original line number Diff line number Diff line
@@ -1030,6 +1030,12 @@ public class DeviceIdleController extends SystemService 
                "light_idle_to_initial_flex";

        private static final String KEY_LIGHT_IDLE_TIMEOUT_MAX_FLEX = "light_max_idle_to_flex";

        private static final String KEY_LIGHT_IDLE_FACTOR = "light_idle_factor";

        private static final String KEY_LIGHT_IDLE_INCREASE_LINEARLY =

                "light_idle_increase_linearly";

        private static final String KEY_LIGHT_IDLE_LINEAR_INCREASE_FACTOR_MS =

                "light_idle_linear_increase_factor_ms";

        private static final String KEY_LIGHT_IDLE_FLEX_LINEAR_INCREASE_FACTOR_MS =

                "light_idle_flex_linear_increase_factor_ms";

        private static final String KEY_LIGHT_MAX_IDLE_TIMEOUT = "light_max_idle_to";

        private static final String KEY_LIGHT_IDLE_MAINTENANCE_MIN_BUDGET =

                "light_idle_maintenance_min_budget";
@@ -1079,6 +1085,10 @@ public class DeviceIdleController extends SystemService 
        private long mDefaultLightIdleTimeoutMaxFlex =

                !COMPRESS_TIME ? 15 * 60 * 1000L : 60 * 1000L;

        private float mDefaultLightIdleFactor = 2f;

        private boolean mDefaultLightIdleIncreaseLinearly;

        private long mDefaultLightIdleLinearIncreaseFactorMs = mDefaultLightIdleTimeout;

        private long mDefaultLightIdleFlexLinearIncreaseFactorMs =

                mDefaultLightIdleTimeoutInitialFlex;

        private long mDefaultLightMaxIdleTimeout =

                !COMPRESS_TIME ? 15 * 60 * 1000L : 60 * 1000L;

        private long mDefaultLightIdleMaintenanceMinBudget =
@@ -1173,6 +1183,37 @@ public class DeviceIdleController extends SystemService 
         */

        public float LIGHT_IDLE_FACTOR = mDefaultLightIdleFactor;



        /**

         * Whether to increase the light idle mode time linearly or exponentially.

         * If true, will increase linearly

         * (i.e. {@link #LIGHT_IDLE_TIMEOUT} + x * {@link #LIGHT_IDLE_LINEAR_INCREASE_FACTOR_MS}).

         * If false, will increase by exponentially

         * (i.e. {@link #LIGHT_IDLE_TIMEOUT} * ({@link #LIGHT_IDLE_FACTOR} ^ x)).

         * This will also impact how the light idle flex value

         * ({@link #LIGHT_IDLE_TIMEOUT_INITIAL_FLEX}) is increased (using

         * {@link #LIGHT_IDLE_FLEX_LINEAR_INCREASE_FACTOR_MS} for the linear increase)..

         *

         * @see #KEY_LIGHT_IDLE_INCREASE_LINEARLY

         */

        public boolean LIGHT_IDLE_INCREASE_LINEARLY = mDefaultLightIdleIncreaseLinearly;



        /**

         * Amount of time to increase the light idle time by, if increasing it linearly.

         *

         * @see #KEY_LIGHT_IDLE_LINEAR_INCREASE_FACTOR_MS

         * @see #LIGHT_IDLE_INCREASE_LINEARLY

         */

        public long LIGHT_IDLE_LINEAR_INCREASE_FACTOR_MS = mDefaultLightIdleLinearIncreaseFactorMs;



        /**

         * Amount of time to increase the light idle flex time by, if increasing it linearly.

         *

         * @see #KEY_LIGHT_IDLE_LINEAR_INCREASE_FACTOR_MS

         * @see #LIGHT_IDLE_INCREASE_LINEARLY

         */

        public long LIGHT_IDLE_FLEX_LINEAR_INCREASE_FACTOR_MS =

                mDefaultLightIdleFlexLinearIncreaseFactorMs;



        /**

         * This is the maximum time we will stay in light idle mode.

         *
@@ -1409,6 +1450,16 @@ public class DeviceIdleController extends SystemService 
                    mDefaultLightIdleTimeoutMaxFlex);

            mDefaultLightIdleFactor = res.getFloat(

                    com.android.internal.R.integer.device_idle_light_idle_factor);

            mDefaultLightIdleIncreaseLinearly = res.getBoolean(

                    com.android.internal.R.bool.device_idle_light_idle_increase_linearly);

            mDefaultLightIdleLinearIncreaseFactorMs = getTimeout(res.getInteger(

                    com.android.internal.R.integer

                            .device_idle_light_idle_linear_increase_factor_ms),

                    mDefaultLightIdleLinearIncreaseFactorMs);

            mDefaultLightIdleFlexLinearIncreaseFactorMs = getTimeout(res.getInteger(

                    com.android.internal.R.integer

                            .device_idle_light_idle_flex_linear_increase_factor_ms),

                    mDefaultLightIdleFlexLinearIncreaseFactorMs);

            mDefaultLightMaxIdleTimeout = getTimeout(

                    res.getInteger(com.android.internal.R.integer.device_idle_light_max_idle_to_ms),

                    mDefaultLightMaxIdleTimeout);
@@ -1487,6 +1538,9 @@ public class DeviceIdleController extends SystemService 
            LIGHT_IDLE_TIMEOUT_INITIAL_FLEX = mDefaultLightIdleTimeoutInitialFlex;

            LIGHT_IDLE_TIMEOUT_MAX_FLEX = mDefaultLightIdleTimeoutMaxFlex;

            LIGHT_IDLE_FACTOR = mDefaultLightIdleFactor;

            LIGHT_IDLE_INCREASE_LINEARLY = mDefaultLightIdleIncreaseLinearly;

            LIGHT_IDLE_LINEAR_INCREASE_FACTOR_MS = mDefaultLightIdleLinearIncreaseFactorMs;

            LIGHT_IDLE_FLEX_LINEAR_INCREASE_FACTOR_MS = mDefaultLightIdleFlexLinearIncreaseFactorMs;

            LIGHT_MAX_IDLE_TIMEOUT = mDefaultLightMaxIdleTimeout;

            LIGHT_IDLE_MAINTENANCE_MIN_BUDGET = mDefaultLightIdleMaintenanceMinBudget;

            LIGHT_IDLE_MAINTENANCE_MAX_BUDGET = mDefaultLightIdleMaintenanceMaxBudget;
@@ -1556,6 +1610,21 @@ public class DeviceIdleController extends SystemService 
                            LIGHT_IDLE_FACTOR = Math.max(1, properties.getFloat(

                                    KEY_LIGHT_IDLE_FACTOR, mDefaultLightIdleFactor));

                            break;

                        case KEY_LIGHT_IDLE_INCREASE_LINEARLY:

                            LIGHT_IDLE_INCREASE_LINEARLY = properties.getBoolean(

                                    KEY_LIGHT_IDLE_INCREASE_LINEARLY,

                                    mDefaultLightIdleIncreaseLinearly);

                            break;

                        case KEY_LIGHT_IDLE_LINEAR_INCREASE_FACTOR_MS:

                            LIGHT_IDLE_LINEAR_INCREASE_FACTOR_MS = properties.getLong(

                                    KEY_LIGHT_IDLE_LINEAR_INCREASE_FACTOR_MS,

                                    mDefaultLightIdleLinearIncreaseFactorMs);

                            break;

                        case KEY_LIGHT_IDLE_FLEX_LINEAR_INCREASE_FACTOR_MS:

                            LIGHT_IDLE_FLEX_LINEAR_INCREASE_FACTOR_MS = properties.getLong(

                                    KEY_LIGHT_IDLE_FLEX_LINEAR_INCREASE_FACTOR_MS,

                                    mDefaultLightIdleFlexLinearIncreaseFactorMs);

                            break;

                        case KEY_LIGHT_MAX_IDLE_TIMEOUT:

                            LIGHT_MAX_IDLE_TIMEOUT = properties.getLong(

                                    KEY_LIGHT_MAX_IDLE_TIMEOUT, mDefaultLightMaxIdleTimeout);
@@ -1716,6 +1785,20 @@ public class DeviceIdleController extends SystemService 
            pw.print(LIGHT_IDLE_FACTOR);

            pw.println();



            pw.print("    "); pw.print(KEY_LIGHT_IDLE_INCREASE_LINEARLY); pw.print("=");

            pw.print(LIGHT_IDLE_INCREASE_LINEARLY);

            pw.println();



            pw.print("    "); pw.print(KEY_LIGHT_IDLE_LINEAR_INCREASE_FACTOR_MS);

            pw.print("=");

            pw.print(LIGHT_IDLE_LINEAR_INCREASE_FACTOR_MS);

            pw.println();



            pw.print("    "); pw.print(KEY_LIGHT_IDLE_FLEX_LINEAR_INCREASE_FACTOR_MS);

            pw.print("=");

            pw.print(LIGHT_IDLE_FLEX_LINEAR_INCREASE_FACTOR_MS);

            pw.println();



            pw.print("    "); pw.print(KEY_LIGHT_MAX_IDLE_TIMEOUT); pw.print("=");

            TimeUtils.formatDuration(LIGHT_MAX_IDLE_TIMEOUT, pw);

            pw.println();
@@ -3694,10 +3777,18 @@ public class DeviceIdleController extends SystemService 
                }

                mMaintenanceStartTime = 0;

                scheduleLightAlarmLocked(mNextLightIdleDelay, mNextLightIdleDelayFlex, true);

                if (!mConstants.LIGHT_IDLE_INCREASE_LINEARLY) {

                    mNextLightIdleDelay = Math.min(mConstants.LIGHT_MAX_IDLE_TIMEOUT,

                            (long) (mNextLightIdleDelay * mConstants.LIGHT_IDLE_FACTOR));

                    mNextLightIdleDelayFlex = Math.min(mConstants.LIGHT_IDLE_TIMEOUT_MAX_FLEX,

                            (long) (mNextLightIdleDelayFlex * mConstants.LIGHT_IDLE_FACTOR));

                } else {

                    mNextLightIdleDelay = Math.min(mConstants.LIGHT_MAX_IDLE_TIMEOUT,

                            mNextLightIdleDelay + mConstants.LIGHT_IDLE_LINEAR_INCREASE_FACTOR_MS);

                    mNextLightIdleDelayFlex = Math.min(mConstants.LIGHT_IDLE_TIMEOUT_MAX_FLEX,

                            mNextLightIdleDelayFlex

                                    + mConstants.LIGHT_IDLE_FLEX_LINEAR_INCREASE_FACTOR_MS);

                }

                moveToLightStateLocked(LIGHT_STATE_IDLE, reason);

                addEvent(EVENT_LIGHT_IDLE, null);

                mGoingIdleWakeLock.acquire();

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3946,7 +3946,7 @@ package android.content.pm { 
    field public static final int DELETE_FAILED_OWNER_BLOCKED = -4; // 0xfffffffc

    field public static final int DELETE_KEEP_DATA = 1; // 0x1

    field public static final int DELETE_SUCCEEDED = 1; // 0x1

    field public static final String EXTRA_REQUEST_PERMISSIONS_DEVICE_ID = "android.content.pm.extra.REQUEST_PERMISSIONS_DEVICE_ID";

    field @FlaggedApi("android.permission.flags.device_aware_permission_apis") public static final String EXTRA_REQUEST_PERMISSIONS_DEVICE_ID = "android.content.pm.extra.REQUEST_PERMISSIONS_DEVICE_ID";

    field public static final String EXTRA_REQUEST_PERMISSIONS_LEGACY_ACCESS_PERMISSION_NAMES = "android.content.pm.extra.REQUEST_PERMISSIONS_LEGACY_ACCESS_PERMISSION_NAMES";

    field public static final String EXTRA_REQUEST_PERMISSIONS_NAMES = "android.content.pm.extra.REQUEST_PERMISSIONS_NAMES";

    field public static final String EXTRA_REQUEST_PERMISSIONS_RESULTS = "android.content.pm.extra.REQUEST_PERMISSIONS_RESULTS";

core/java/android/companion/CompanionDeviceManager.java

+9 −3
Original line number Diff line number Diff line
@@ -239,6 +239,12 @@ public final class CompanionDeviceManager { 
    @SystemApi(client = MODULE_LIBRARIES)

    public static final int MESSAGE_REQUEST_PERMISSION_RESTORE = 0x63826983; // ?RES



    /**

     * The length limit of Association tag.

     * @hide

     */

    private static final int ASSOCIATION_TAG_LENGTH_LIMIT = 100;



    /**

     * Callback for applications to receive updates about and the outcome of

     * {@link AssociationRequest} issued via {@code associate()} call.
@@ -1409,7 +1415,7 @@ public final class CompanionDeviceManager { 
    /**

     * Sets the {@link AssociationInfo#getTag() tag} for this association.

     *

     * <p>The length of the tag must be at most 20 characters.

     * <p>The length of the tag must be at most 100 characters to save disk space.

     *

     * <p>This allows to store useful information about the associated devices.

     *
@@ -1421,8 +1427,8 @@ public final class CompanionDeviceManager { 
    public void setAssociationTag(int associationId, @NonNull String tag) {

        Objects.requireNonNull(tag, "tag cannot be null");



        if (tag.length() > 20) {

            throw new IllegalArgumentException("Length of the tag must be at most 20 characters");

        if (tag.length() > ASSOCIATION_TAG_LENGTH_LIMIT) {

            throw new IllegalArgumentException("Length of the tag must be at most 100 characters");

        }



        try {

core/java/android/content/pm/PackageManager.java

+1 −0
Original line number Diff line number Diff line
@@ -4802,6 +4802,7 @@ public abstract class PackageManager { 
     * @hide

     */

    @SystemApi

    @FlaggedApi(android.permission.flags.Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS)

    public static final String EXTRA_REQUEST_PERMISSIONS_DEVICE_ID =

            "android.content.pm.extra.REQUEST_PERMISSIONS_DEVICE_ID";