Snap for 12370120 from 31eb3031b9a31d82423f755bef7ff3aa3eb62411 to 25Q2-release (096f15ed) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+25 −0

Original line number	Diff line number	Diff line
		@@ -20,10 +20,12 @@ 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.app.flags-aconfig-java",
		"android.app.jank.flags-aconfig-java",
		"android.app.ondeviceintelligence-aconfig-java",
		"android.app.smartspace.flags-aconfig-java",
		"android.app.supervision.flags-aconfig-java",
		@@ -76,6 +78,7 @@ aconfig_declarations_group {
		"android.view.inputmethod.flags-aconfig-java",
		"android.webkit.flags-aconfig-java",
		"android.widget.flags-aconfig-java",
		"art_exported_aconfig_flags_lib",
		"backstage_power_flags_lib",
		"backup_flags_lib",
		"camera_platform_flags_core_java_lib",
		@@ -138,6 +141,14 @@ java_defaults {
		libs: ["fake_device_config"],
		}

		// ART
		java_aconfig_library {
		name: "art_exported_aconfig_flags_lib",
		aconfig_declarations: "art-aconfig-flags",
		mode: "exported",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Camera
		java_aconfig_library {
		name: "camera_platform_flags_core_java_lib",
		@@ -1605,3 +1616,17 @@ java_aconfig_library {
		aconfig_declarations: "interaction_jank_monitor_flags",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// App Jank
		aconfig_declarations {
		name: "android.app.jank.flags-aconfig",
		package: "android.app.jank",
		container: "system",
		srcs: ["core/java/android/app/jank/flags.aconfig"],
		}

		java_aconfig_library {
		name: "android.app.jank.flags-aconfig-java",
		aconfig_declarations: "android.app.jank.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

Android.bp

+2 −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",
		@@ -426,6 +427,7 @@ java_defaults {
		"modules-utils-expresslog",
		"perfetto_trace_javastream_protos_jarjar",
		"libaconfig_java_proto_nano",
		"aconfig_device_paths_java",
		],
		}

BROADCASTS_OWNERS

+2 −2

Original line number	Diff line number	Diff line
		# Bug component: 316181
		ctate@android.com
		jsharkey@google.com
		set noparent

		sudheersai@google.com
		yamasani@google.com #{LAST_RESORT_SUGGESTION}

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
		}