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

Commit 73d08dee authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12770256 from 450f8ab1 to 25Q2-release 

Change-Id: Ic00bd542060d287f72cbfcbbd5f20894019ffc50
parents ea9ac30c 450f8ab1

AconfigFlags.bp

+42 −35
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ aconfig_declarations_group { 
        "android.media.tv.flags-aconfig-java",

        "android.multiuser.flags-aconfig-java",

        "android.net.platform.flags-aconfig-java",

        "android.net.vcn.flags-aconfig-java-export",

        "android.net.wifi.flags-aconfig-java",

        "android.nfc.flags-aconfig-java",

        "android.os.flags-aconfig-java",
@@ -96,6 +95,7 @@ aconfig_declarations_group { 
        "com.android.internal.foldables.flags-aconfig-java",

        "com.android.internal.os.flags-aconfig-java",

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

        "com.android.internal.widget.flags-aconfig-java",

        "com.android.media.flags.bettertogether-aconfig-java",

        "com.android.media.flags.editing-aconfig-java",

        "com.android.media.flags.performance-aconfig-java",
@@ -280,6 +280,19 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



aconfig_declarations {

    name: "com.android.internal.widget.flags-aconfig",

    package: "com.android.internal.widget.flags",

    container: "system",

    srcs: ["core/java/com/android/internal/widget/*.aconfig"],

}



java_aconfig_library {

    name: "com.android.internal.widget.flags-aconfig-java",

    aconfig_declarations: "com.android.internal.widget.flags-aconfig",

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

}



// Text

aconfig_declarations {

    name: "com.android.text.flags-aconfig",
@@ -623,6 +636,11 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

    name: "aconfig_hardware_flags_c_lib",

    aconfig_declarations: "android.hardware.flags-aconfig",

}



// Widget

aconfig_declarations {

    name: "android.widget.flags-aconfig",
@@ -790,21 +808,6 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// OnDeviceIntelligence

aconfig_declarations {

    name: "android.app.ondeviceintelligence-aconfig",

    exportable: true,

    package: "android.app.ondeviceintelligence.flags",

    container: "system",

    srcs: ["core/java/android/app/ondeviceintelligence/flags/ondevice_intelligence.aconfig"],

}



java_aconfig_library {

    name: "android.app.ondeviceintelligence-aconfig-java",

    aconfig_declarations: "android.app.ondeviceintelligence-aconfig",

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

}



// Permissions

aconfig_declarations {

    name: "android.permission.flags-aconfig",
@@ -986,6 +989,11 @@ aconfig_declarations { 
java_aconfig_library {

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

    aconfig_declarations: "android.app.flags-aconfig",

    min_sdk_version: "34",

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",

    ],

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

}
@@ -1204,25 +1212,6 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// VCN

// TODO:376339506 Move the VCN code, the flag declaration and

// java_aconfig_library to framework-connectivity-b

aconfig_declarations {

    name: "android.net.vcn.flags-aconfig",

    package: "android.net.vcn",

    container: "com.android.tethering",

    exportable: true,

    srcs: ["core/java/android/net/vcn/*.aconfig"],

}



java_aconfig_library {

    name: "android.net.vcn.flags-aconfig-java-export",

    aconfig_declarations: "android.net.vcn.flags-aconfig",

    mode: "exported",

    min_sdk_version: "35",

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

}



// DevicePolicy

aconfig_declarations {

    name: "device_policy_aconfig_flags",
@@ -1239,6 +1228,17 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "device_policy_aconfig_flags_java_export",

    aconfig_declarations: "device_policy_aconfig_flags",

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

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

    ],

}



java_aconfig_library {

    name: "device_policy_aconfig_flags_lib_host",

    aconfig_declarations: "device_policy_aconfig_flags",
@@ -1467,6 +1467,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "android.appwidget.flags-aconfig-java-host",

    aconfig_declarations: "android.appwidget.flags-aconfig",

    host_supported: true,

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

}



// App

aconfig_declarations {

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

Android.bp

+10 −1
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ filegroup { 
        ":framework-wifi-non-updatable-sources",

        ":PacProcessor-aidl-sources",

        ":ProxyHandler-aidl-sources",

        ":vcn-utils-platform-sources",

        ":net-utils-framework-common-srcs",



        // AIDL from frameworks/base/native/
@@ -314,6 +315,7 @@ java_defaults { 
            ":framework-telephony-sources",

            ":framework-wifi-annotations",

            ":framework-wifi-non-updatable-sources",

            ":vcn-utils-platform-sources",

            ":PacProcessor-aidl-sources",

            ":ProxyHandler-aidl-sources",

            ":net-utils-framework-common-srcs",
@@ -444,6 +446,9 @@ java_library { 
        default: [

            "framework-platformcrashrecovery.impl",

        ],

    }) + select(release_flag("RELEASE_ONDEVICE_INTELLIGENCE_MODULE"), {

        true: [],

        default: ["framework-ondeviceintelligence-platform.impl"],

    }),

    sdk_version: "core_platform",

    installable: false,
@@ -487,6 +492,7 @@ java_library { 
    apex_available: ["//apex_available:platform"],

    visibility: [

        "//frameworks/base:__subpackages__",

        "//packages/modules/NeuralNetworks:__subpackages__",

    ],

    compile_dex: false,

    headers_only: true,
@@ -582,6 +588,9 @@ java_library { 
        default: [

            "framework-platformcrashrecovery-compat-config",

        ],

    }) + select(release_flag("RELEASE_ONDEVICE_INTELLIGENCE_MODULE"), {

        true: [],

        default: ["framework-ondeviceintelligence-platform-compat-config"],

    }),

}
@@ -596,7 +605,7 @@ filegroup { 
    srcs: [

        "core/java/com/android/internal/util/HexDump.java",

        "core/java/com/android/internal/util/WakeupMessage.java",

        "core/java/android/net/vcn/util/PersistableBundleUtils.java",

        "packages/Vcn/framework-b/src/android/net/vcn/util/PersistableBundleUtils.java",

        "telephony/java/android/telephony/Annotation.java",

    ],

}

apex/jobscheduler/service/aconfig/job.aconfig

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ flag { 
   name: "remove_user_during_user_switch"

   namespace: "backstage_power"

   description: "Remove started user if user will be stopped due to user switch"

   bug: "321598070"

   bug: "337077643"

}



flag {

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

+11 −5
Original line number Diff line number Diff line
@@ -1981,7 +1981,12 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    jobStatus.getNumAppliedFlexibleConstraints(),

                    jobStatus.getNumDroppedFlexibleConstraints(),

                    jobStatus.getFilteredTraceTag(),

                    jobStatus.getFilteredDebugTags());

                    jobStatus.getFilteredDebugTags(),

                    jobStatus.getNumAbandonedFailures(),

                    /* 0 is reserved for UNKNOWN_POLICY */

                    jobStatus.getJob().getBackoffPolicy() + 1,

                    shouldUseAggressiveBackoff(jobStatus.getNumAbandonedFailures()));





            // If the job is immediately ready to run, then we can just immediately

            // put it in the pending list and try to schedule it.  This is especially
@@ -2422,7 +2427,11 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    cancelled.getNumAppliedFlexibleConstraints(),

                    cancelled.getNumDroppedFlexibleConstraints(),

                    cancelled.getFilteredTraceTag(),

                    cancelled.getFilteredDebugTags());

                    cancelled.getFilteredDebugTags(),

                    cancelled.getNumAbandonedFailures(),

                    /* 0 is reserved for UNKNOWN_POLICY */

                    cancelled.getJob().getBackoffPolicy() + 1,

                    shouldUseAggressiveBackoff(cancelled.getNumAbandonedFailures()));

        }

        // If this is a replacement, bring in the new version of the job

        if (incomingJob != null) {
@@ -5917,9 +5926,6 @@ public class JobSchedulerService extends com.android.server.SystemService 
            pw.print(Flags.FLAG_DO_NOT_FORCE_RUSH_EXECUTION_AT_BOOT,

                    Flags.doNotForceRushExecutionAtBoot());

            pw.println();

            pw.print(android.app.job.Flags.FLAG_BACKUP_JOBS_EXEMPTION,

                    android.app.job.Flags.backupJobsExemption());

            pw.println();

            pw.print(android.app.job.Flags.FLAG_IGNORE_IMPORTANT_WHILE_FOREGROUND,

                    android.app.job.Flags.ignoreImportantWhileForeground());

            pw.println();

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

+0 −3
Original line number Diff line number Diff line
@@ -433,9 +433,6 @@ public final class JobSchedulerShellCommand extends BasicShellCommandHandler { 
            case com.android.server.job.Flags.FLAG_DO_NOT_FORCE_RUSH_EXECUTION_AT_BOOT:

                pw.println(com.android.server.job.Flags.doNotForceRushExecutionAtBoot());

                break;

            case android.app.job.Flags.FLAG_BACKUP_JOBS_EXEMPTION:

                pw.println(android.app.job.Flags.backupJobsExemption());

                break;

            case android.app.job.Flags.FLAG_IGNORE_IMPORTANT_WHILE_FOREGROUND:

                pw.println(android.app.job.Flags.ignoreImportantWhileForeground());

                break;