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

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

Snap for 12348750 from 3bb73ab4 to 24Q4-release 

Change-Id: I52dfd3bff155ba33da0888fe24ba8f750b18baa1
parents bb825162 3bb73ab4

AconfigFlags.bp

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

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

        "aconfig_mediacodec_flags_java_lib",

        "android-sdk-flags-java",

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

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

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

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ filegroup { 
        ":android.frameworks.location.altitude-V2-java-source",

        ":android.hardware.biometrics.common-V4-java-source",

        ":android.hardware.biometrics.fingerprint-V5-java-source",

        ":android.hardware.biometrics.fingerprint.virtualhal-java-source",

        ":android.hardware.biometrics.face-V4-java-source",

        ":android.hardware.gnss-V2-java-source",

        ":android.hardware.graphics.common-V3-java-source",

android-sdk-flags/Android.bp

0 → 100644
+30 −0
Original line number Diff line number Diff line 
// Copyright (C) 2024 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package {

    default_applicable_licenses: ["frameworks_base_license"],

}



aconfig_declarations {

    name: "android-sdk-flags",

    package: "android.sdk",

    container: "system",

    srcs: ["flags.aconfig"],

}



java_aconfig_library {

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

    aconfig_declarations: "android-sdk-flags",

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

}

android-sdk-flags/flags.aconfig

0 → 100644
+12 −0
Original line number Diff line number Diff line 
package: "android.sdk"

container: "system"



flag {

    name: "major_minor_versioning_scheme"

    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"



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

    is_fixed_read_only: true

}

apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING

+2 −6
Original line number Diff line number Diff line
@@ -10,14 +10,10 @@ 
      ]

    },

    {

      "name": "CtsBRSTestCases",

      "options": [

        {"exclude-annotation": "androidx.test.filters.FlakyTest"},

        {"exclude-annotation": "org.junit.Ignore"}

      ]

      "name": "CtsBRSTestCases"

    },

    {

      "name": "FrameworksServicesTests_com_android_server_usage_Presubmit"

      "name": "FrameworksServicesTests_com_android_server_usage"

    }

  ],

  "postsubmit": [