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

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

Snap for 12730974 from 7ea2db7f to 25Q2-release 

Change-Id: I4ff0c4df2ac5b562bb8f6e7116d0616cc10df052
parents 643e66a7 7ea2db7f

AconfigFlags.bp

+31 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ aconfig_declarations_group { 
        "aconfig_mediacodec_flags_java_lib",

        "aconfig_settingslib_flags_java_lib",

        "aconfig_trade_in_mode_flags_java_lib",

        "android-sdk-flags-java",

        "adpf_flags_java_lib",

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

        "android.app.appfunctions.flags-aconfig-java",

        "android.app.assist.flags-aconfig-java",
@@ -63,6 +63,7 @@ aconfig_declarations_group { 
        "android.os.vibrator.flags-aconfig-java",

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

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

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

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

        "android.server.app.flags-aconfig-java",

        "android.service.autofill.flags-aconfig-java",
@@ -99,12 +100,14 @@ aconfig_declarations_group { 
        "com.android.media.flags.editing-aconfig-java",

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

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

        "com.android.net.http.flags-aconfig-exported-java",

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

        "com.android.ranging.flags.ranging-aconfig-java-export",

        "com.android.server.contextualsearch.flags-java",

        "com.android.server.flags.services-aconfig-java",

        "com.android.text.flags-aconfig-java",

        "com.android.window.flags.window-aconfig-java",

        "conscrypt_exported_aconfig_flags_lib",

        "device_policy_aconfig_flags_lib",

        "display_flags_lib",

        "dropbox_flags_lib",
@@ -194,6 +197,14 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Conscrypt

java_aconfig_library {

    name: "conscrypt_exported_aconfig_flags_lib",

    aconfig_declarations: "conscrypt-aconfig-flags",

    mode: "exported",

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

}



// Telecom

java_aconfig_library {

    name: "telecom_flags_core_java_lib",
@@ -328,6 +339,7 @@ cc_aconfig_library { 
    name: "android_nfc_flags_aconfig_c_lib",

    vendor_available: true,

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

    min_sdk_version: "34",

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",
@@ -437,6 +449,8 @@ java_aconfig_library { 
    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.art",

        "com.android.art.debug",

        "com.android.btservices",

        "com.android.mediaprovider",

        "com.android.permission",
@@ -652,6 +666,8 @@ java_aconfig_library { 
    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.art",

        "com.android.art.debug",

        "com.android.permission",

    ],

}
@@ -871,6 +887,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Adaptive Performance

java_aconfig_library {

    name: "adpf_flags_java_lib",

    aconfig_declarations: "adpf_flags",

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

}



// Graphics

java_aconfig_library {

    name: "hwui_flags_java_lib",
@@ -966,6 +989,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

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

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

    host_supported: true,

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

}



// Broadcast Radio

aconfig_declarations {

    name: "android.hardware.radio.flags-aconfig",

Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ filegroup { 
        ":framework-telecomm-sources",

        ":framework-telephony-common-sources",

        ":framework-telephony-sources",

        ":framework-vcn-util-sources",

        ":framework-wifi-annotations",

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

        ":PacProcessor-aidl-sources",
@@ -313,7 +312,6 @@ java_defaults { 
            ":framework-telecomm-sources",

            ":framework-telephony-common-sources",

            ":framework-telephony-sources",

            ":framework-vcn-util-sources",

            ":framework-wifi-annotations",

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

            ":PacProcessor-aidl-sources",
@@ -371,6 +369,7 @@ java_defaults { 
        "view-inspector-annotation-processor",

        "staledataclass-annotation-processor",

        "error_prone_android_framework",

        "systemfeatures-metadata-processor",

    ],

    // Exports needed for staledataclass-annotation-processor, see b/139342589.

    javacflags: [
@@ -597,7 +596,7 @@ filegroup { 
    srcs: [

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

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

        "services/core/java/com/android/server/vcn/util/PersistableBundleUtils.java",

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

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

    ],

}

PREUPLOAD.cfg

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               tests/

               tools/

bpfmt = -d

ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI,libs/WindowManager/Shell/src/com/android/wm/shell/freeform,libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/education

ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI,libs/WindowManager/Shell/src/com/android/wm/shell/freeform,libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

android-sdk-flags/Android.bp

+10 −3
Original line number Diff line number Diff line
@@ -17,14 +17,21 @@ package { 
}



aconfig_declarations {

    name: "android-sdk-flags",

    name: "android.sdk.flags-aconfig",

    package: "android.sdk",

    container: "system",

    srcs: ["flags.aconfig"],

}



java_aconfig_library {

    name: "android-sdk-flags-java",

    aconfig_declarations: "android-sdk-flags",

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

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

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

}



java_aconfig_library {

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

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

    host_supported: true,

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

}

apex/jobscheduler/framework/aconfig/job.aconfig

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ flag { 
   namespace: "backstage_power"

   description: "Detect, report and take action on jobs that maybe abandoned by the app without calling jobFinished."

   bug: "372529068"

   is_exported: true

}



flag {
@@ -36,6 +37,7 @@ flag { 
    namespace: "backstage_power"

    description: "Ignore the important_while_foreground flag and change the related APIs to be not effective"

    bug: "374175032"

    is_exported: true

}



flag {