Snap for 13374957 from 62e8a5127a33b1d76455b26b3ab1a40cd44a587a to 25Q3-release (c37bb407) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+19 −1

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ aconfig_declarations_group {
		"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.mediasession-aconfig-java",
		"com.android.media.flags.performance-aconfig-java",
		"com.android.media.flags.projection-aconfig-java",
		"com.android.net.http.flags-aconfig-exported-java",
		@@ -125,8 +126,8 @@ aconfig_declarations_group {
		"libcore_exported_aconfig_flags_lib",
		"libcore_readonly_aconfig_flags_lib",
		"libgui_flags_java_lib",
		"power_flags_lib",
		"networksecurity_exported_aconfig_flags_lib",
		"power_flags_lib",
		"sdk_sandbox_exported_flags_lib",
		"surfaceflinger_flags_java_lib",
		"telecom_flags_core_java_lib",
		@@ -815,6 +816,23 @@ cc_aconfig_library {
		aconfig_declarations: "com.android.media.flags.editing-aconfig",
		}

		// MediaSession
		aconfig_declarations {
		name: "com.android.media.flags.mediasession-aconfig",
		exportable: true,
		package: "com.android.media.mediasession.flags",
		container: "system",
		srcs: [
		"media/java/android/media/flags/mediasession.aconfig",
		],
		}

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

		// MediaProjection
		aconfig_declarations {
		name: "com.android.media.flags.projection-aconfig",

Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -197,7 +197,7 @@ java_defaults {
		"opengl/java",
		"rs/java",
		"sax/java",
		"telecomm/java",
		"telecomm/framework/java",

		// TODO(b/147699819): remove this
		"telephony/java",
		@@ -419,6 +419,7 @@ java_defaults {
		"modules-utils-preconditions",
		"modules-utils-statemachine",
		"modules-utils-os",
		"modules-utils-ravenwood",
		"modules-utils-uieventlogger-interface",
		"framework-permission-aidl-java",
		"spatializer-aidl-java",

apex/jobscheduler/OWNERS

+6 −6

Original line number	Diff line number	Diff line
		@@ -5,21 +5,21 @@ per-file service/aconfig/job.aconfig = file:/apex/jobscheduler/JOB_OWNERS
		per-file service/aconfig/app_idle.aconfig = file:/apex/jobscheduler/JOB_OWNERS
		per-file Job = file:/apex/jobscheduler/JOB_OWNERS
		per-file Standby = file:/apex/jobscheduler/JOB_OWNERS
		per-file framework/java/android/app/job/* = file:/apex/jobscheduler/JOB_OWNERS
		per-file framework/java/com/android/server/job/* = file:/apex/jobscheduler/JOB_OWNERS
		per-file service/java/com/android/server/job/* = file:/apex/jobscheduler/JOB_OWNERS
		per-file framework/java/android/app/job/** = file:/apex/jobscheduler/JOB_OWNERS
		per-file framework/java/com/android/server/job/** = file:/apex/jobscheduler/JOB_OWNERS
		per-file service/java/com/android/server/job/** = file:/apex/jobscheduler/JOB_OWNERS

		# For Alarm Manager changes, ALARM_OWNERS
		per-file ALARM_OWNERS = file:/apex/jobscheduler/ALARM_OWNERS
		per-file service/aconfig/alarm.aconfig = file:/apex/jobscheduler/ALARM_OWNERS
		per-file Alarm = file:/apex/jobscheduler/ALARM_OWNERS
		per-file service/java/com/android/server/alarm/* = file:/apex/jobscheduler/ALARM_OWNERS
		per-file service/java/com/android/server/alarm/** = file:/apex/jobscheduler/ALARM_OWNERS

		# For Device Idle changes, DEVICE_IDLE_OWNERS
		per-file DEVICE_IDLE_OWNERS = file:/apex/jobscheduler/DEVICE_IDLE_OWNERS
		per-file service/aconfig/device_idle.aconfig = file:/apex/jobscheduler/DEVICE_IDLE_OWNERS
		per-file Idle = file:/apex/jobscheduler/DEVICE_IDLE_OWNERS
		per-file service/java/com/android/server/deviceidle/* = file:/apex/jobscheduler/DEVICE_IDLE_OWNERS
		per-file framework/java/com/android/server/deviceidle/* = file:/apex/jobscheduler/DEVICE_IDLE_OWNERS
		per-file service/java/com/android/server/deviceidle/** = file:/apex/jobscheduler/DEVICE_IDLE_OWNERS
		per-file framework/java/com/android/server/deviceidle/** = file:/apex/jobscheduler/DEVICE_IDLE_OWNERS

		suprabh@google.com #{LAST_RESORT_SUGGESTION}
		No newline at end of file

apex/jobscheduler/service/aconfig/job.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -29,16 +29,6 @@ flag {
		bug: "299329948"
		}

		flag {
		name: "count_quota_fix"
		namespace: "backstage_power"
		description: "Fix job count quota check"
		bug: "300862949"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "thermal_restrictions_to_fgs_jobs"
		namespace: "backstage_power"

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1652,7 +1652,7 @@ class JobConcurrencyManager {
		continue;
		}

		if (Flags.countQuotaFix() && !nextPending.isReady()) {
		if (!nextPending.isReady()) {
		// This could happen when the constraints for the job have been marked
		// as unsatisfiled but hasn't been removed from the pending queue yet.
		if (DEBUG) {
		@@ -1749,7 +1749,7 @@ class JobConcurrencyManager {
		continue;
		}

		if (Flags.countQuotaFix() && !nextPending.isReady()) {
		if (!nextPending.isReady()) {
		// This could happen when the constraints for the job have been marked
		// as unsatisfiled but hasn't been removed from the pending queue yet.
		if (DEBUG) {