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

Commit 9f859668 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11406759 from 72dc708c to 24Q2-release 

Change-Id: I7c33b9937021c7d492b31b0039def0ec3adf09ed
parents 607ce886 72dc708c

AconfigFlags.bp

+20 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ aconfig_srcjars = [ 
    ":com.android.hardware.input-aconfig-java{.generated_srcjars}",

    ":com.android.input.flags-aconfig-java{.generated_srcjars}",

    ":com.android.internal.foldables.flags-aconfig-java{.generated_srcjars}",

    ":com.android.internal.pm.pkg.component.flags-aconfig-java{.generated_srcjars}",

    ":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",

    ":com.android.media.flags.editing-aconfig-java{.generated_srcjars}",

    ":com.android.net.thread.flags-aconfig-java{.generated_srcjars}",
@@ -1138,3 +1139,22 @@ java_aconfig_library { 
    aconfig_declarations: "android.app.wearable.flags-aconfig",

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

}



aconfig_declarations {

    name: "com.android.internal.pm.pkg.component.flags-aconfig",

    package: "com.android.internal.pm.pkg.component.flags",

    srcs: ["core/java/com/android/internal/pm/pkg/component/flags/flags.aconfig"],

}



java_aconfig_library {

    name: "com.android.internal.pm.pkg.component.flags-aconfig-java",

    aconfig_declarations: "com.android.internal.pm.pkg.component.flags-aconfig",

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

}



java_aconfig_library {

    name: "com.android.internal.pm.pkg.component.flags-aconfig-java-host",

    aconfig_declarations: "com.android.internal.pm.pkg.component.flags-aconfig",

    host_supported: true,

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

}

apex/jobscheduler/service/aconfig/job.aconfig

+14 −7
Original line number Diff line number Diff line 
package: "com.android.server.job"



flag {

    name: "batch_active_bucket_jobs"

    namespace: "backstage_power"

    description: "Include jobs in the ACTIVE bucket in the job batching effort. Don't let them run as freely as they're ready."

    bug: "299329948"

}



flag {

    name: "batch_connectivity_jobs_per_network"

    namespace: "backstage_power"

    description: "Have JobScheduler attempt to delay the start of some connectivity jobs until there are several ready or the network is active"

    bug: "28382445"

}



flag {

    name: "do_not_force_rush_execution_at_boot"

    namespace: "backstage_power"
@@ -20,10 +34,3 @@ flag { 
    description: "Throw an exception if an unsupported app uses JobInfo.setBias"

    bug: "300477393"

}
 


flag {

    name: "batch_jobs_on_network_activation"

    namespace: "backstage_power"

    description: "Have JobScheduler attempt to delay the start of some connectivity jobs until the network is actually active"

    bug: "318394184"

}

apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ class JobConcurrencyManager { 


    static final String CONFIG_KEY_PREFIX_CONCURRENCY = "concurrency_";

    private static final String KEY_CONCURRENCY_LIMIT = CONFIG_KEY_PREFIX_CONCURRENCY + "limit";

    @VisibleForTesting

    static final int DEFAULT_CONCURRENCY_LIMIT;



    static {