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

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

Snap for 12632753 from 4beb9b78 to 25Q2-release 

Change-Id: Ie1151dfa9df46a9a6ea9c5b1ef03e702891c4812
parents 7f2f8530 4beb9b78

AconfigFlags.bp

+25 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ aconfig_declarations_group { 
    java_aconfig_libraries: [

        // !!! KEEP THIS LIST ALPHABETICAL !!!

        "aconfig_mediacodec_flags_java_lib",

        "aconfig_settingslib_flags_java_lib",

        "aconfig_trade_in_mode_flags_java_lib",

        "android-sdk-flags-java",

        "android.adaptiveauth.flags-aconfig-java",
@@ -348,6 +349,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.security",

    exportable: true,

    container: "system",

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

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

}



java_aconfig_library {

    name: "android.security.flags-aconfig-java-export",

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

    mode: "exported",

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

}



cc_aconfig_library {

    name: "android_security_flags_aconfig_c_lib",

    aconfig_declarations: "android.security.flags-aconfig",
@@ -1749,3 +1758,19 @@ cc_aconfig_library { 
    ],

    min_sdk_version: "apex_inherit",

}



// Settings Lib

aconfig_declarations {

    name: "aconfig_settingslib_flags",

    package: "com.android.settingslib.flags",

    container: "system",

    srcs: [

        "packages/SettingsLib/aconfig/settingslib.aconfig",

    ],

}



java_aconfig_library {

    name: "aconfig_settingslib_flags_java_lib",

    aconfig_declarations: "aconfig_settingslib_flags",

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

}

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ java_library { 
        "android.hardware.contexthub-V1.0-java",

        "android.hardware.contexthub-V1.1-java",

        "android.hardware.contexthub-V1.2-java",

        "android.hardware.contexthub-V3-java",

        "android.hardware.contexthub-V4-java",

        "android.hardware.gnss-V1.0-java",

        "android.hardware.gnss-V2.1-java",

        "android.hardware.health-V1.0-java-constants",
@@ -399,6 +399,7 @@ java_defaults { 
        "com.android.sysprop.foldlockbehavior",

        "com.android.sysprop.view",

        "framework-internal-utils",

        "dynamic_instrumentation_manager_aidl-java",

        // If MimeMap ever becomes its own APEX, then this dependency would need to be removed

        // in favor of an API stubs dependency in java_library "framework" below.

        "mimemap",

android-sdk-flags/OWNERS

0 → 100644
+1 −0
Original line number Diff line number Diff line 
include /SDK_OWNERS

android-sdk-flags/flags.aconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ flag { 
    namespace: "android_sdk"

    description: "Use the new SDK major.minor versioning scheme (e.g. Android 40.1) which replaces the old single-integer scheme (e.g. Android 15)."

    bug: "350458259"

    is_exported: true



    # Use is_fixed_read_only because DeviceConfig may not be available when Build.VERSION_CODES is first accessed

    is_fixed_read_only: true

apct-tests/perftests/core/src/android/os/LongArrayMultiStateCounterPerfTest.java

+1 −3
Original line number Diff line number Diff line
@@ -159,9 +159,7 @@ public class LongArrayMultiStateCounterPerfTest { 
        LongArrayMultiStateCounter counter = new LongArrayMultiStateCounter(2, 4);

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        long time = 1000;

        LongArrayMultiStateCounter.LongArrayContainer timeInFreq =

                new LongArrayMultiStateCounter.LongArrayContainer(4);

        timeInFreq.setValues(new long[]{100, 200, 300, 400});

        long[] timeInFreq = {100, 200, 300, 400};

        while (state.keepRunning()) {

            counter.setState(1, time);

            counter.setState(0, time + 1000);