Snap for 12492053 from 03d3bf8808be34c95785453bc57810e07355538c to 25Q2-release (7ce81be5) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+31 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ aconfig_declarations_group {
		"android-sdk-flags-java",
		"android.adaptiveauth.flags-aconfig-java",
		"android.app.appfunctions.flags-aconfig-java",
		"android.app.assist.flags-aconfig-java",
		"android.app.contextualsearch.flags-aconfig-java",
		"android.app.flags-aconfig-java",
		"android.app.jank.flags-aconfig-java",
		@@ -64,6 +65,7 @@ aconfig_declarations_group {
		"android.server.app.flags-aconfig-java",
		"android.service.autofill.flags-aconfig-java",
		"android.service.chooser.flags-aconfig-java",
		"android.service.compat.flags-aconfig-java",
		"android.service.controls.flags-aconfig-java",
		"android.service.dreams.flags-aconfig-java",
		"android.service.notification.flags-aconfig-java",
		@@ -862,6 +864,21 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		aconfig_declarations {
		name: "android.service.compat.flags-aconfig",
		package: "com.android.server.compat",
		container: "system",
		srcs: [
		"services/core/java/com/android/server/compat/*.aconfig",
		],
		}

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

		// Multi user
		aconfig_declarations {
		name: "android.multiuser.flags-aconfig",
		@@ -1230,6 +1247,20 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

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

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

		// Smartspace
		aconfig_declarations {
		name: "android.app.smartspace.flags-aconfig",

Android.bp

+1 −6

Original line number	Diff line number	Diff line
		@@ -150,6 +150,7 @@ filegroup {
		// etc.
		":framework-javastream-protos",
		":statslog-framework-java-gen", // FrameworkStatsLog.java
		":statslog-hwui-java-gen", // HwuiStatsLog.java
		":audio_policy_configuration_V7_0",
		],
		}
		@@ -170,12 +171,6 @@ java_library {
		//same purpose.
		"//external/robolectric:__subpackages__",
		"//frameworks/layoutlib:__subpackages__",

		// This is for the same purpose as robolectric -- to build "framework.jar" for host-side
		// testing.
		// TODO: Once Ravenwood is stable, move the host side jar targets to this directory,
		// and remove this line.
		"//frameworks/base/tools/hoststubgen:__subpackages__",
		],
		}

Ravenwood.bp

+9 −246

Original line number	Diff line number	Diff line
		@@ -12,256 +12,19 @@
		// See the License for the specific language governing permissions and
		// limitations under the License.

		// We need this "trampoline" rule to force soong to give a host-side jar to
		// framework-minus-apex.ravenwood-base. Otherwise, soong would mix up the arch (?) and we'd get
		// a dex jar.
		java_library {
		name: "framework-minus-apex-for-hoststubgen",
		installable: false, // host only jar.
		static_libs: [
		"framework-minus-apex",
		],
		sdk_version: "core_platform",
		visibility: ["//visibility:private"],
		}

		// Process framework-all with hoststubgen for Ravenwood.
		// This step takes several tens of seconds, so we manually shard it to multiple modules.
		// All the copies have to be kept in sync.
		// TODO: Do the sharding better, either by making hostsubgen support sharding natively, or
		// making a better build rule.

		genrule_defaults {
		name: "framework-minus-apex.ravenwood-base_defaults",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		tools: ["hoststubgen"],
		srcs: [
		":framework-minus-apex-for-hoststubgen",
		":ravenwood-framework-policies",
		":ravenwood-standard-options",
		":ravenwood-annotation-allowed-classes",
		],
		out: [
		"ravenwood.jar",
		"hoststubgen_framework-minus-apex.log",
		],
		}

		framework_minus_apex_cmd = "$(location hoststubgen) " +
		"@$(location :ravenwood-standard-options) " +
		"--debug-log $(location hoststubgen_framework-minus-apex.log) " +
		"--out-jar $(location ravenwood.jar) " +
		"--in-jar $(location :framework-minus-apex-for-hoststubgen) " +
		"--policy-override-file $(location :ravenwood-framework-policies) " +
		"--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) "

		java_genrule {
		name: "framework-minus-apex.ravenwood-base_X0",
		defaults: ["framework-minus-apex.ravenwood-base_defaults"],
		cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 0",
		}

		java_genrule {
		name: "framework-minus-apex.ravenwood-base_X1",
		defaults: ["framework-minus-apex.ravenwood-base_defaults"],
		cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 1",
		}

		java_genrule {
		name: "framework-minus-apex.ravenwood-base_X2",
		defaults: ["framework-minus-apex.ravenwood-base_defaults"],
		cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 2",
		}

		java_genrule {
		name: "framework-minus-apex.ravenwood-base_X3",
		defaults: ["framework-minus-apex.ravenwood-base_defaults"],
		cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 3",
		}

		java_genrule {
		name: "framework-minus-apex.ravenwood-base_X4",
		defaults: ["framework-minus-apex.ravenwood-base_defaults"],
		cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 4",
		}

		java_genrule {
		name: "framework-minus-apex.ravenwood-base_X5",
		defaults: ["framework-minus-apex.ravenwood-base_defaults"],
		cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 5",
		}

		java_genrule {
		name: "framework-minus-apex.ravenwood-base_X6",
		defaults: ["framework-minus-apex.ravenwood-base_defaults"],
		cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 6",
		}

		java_genrule {
		name: "framework-minus-apex.ravenwood-base_X7",
		defaults: ["framework-minus-apex.ravenwood-base_defaults"],
		cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 7",
		}

		java_genrule {
		name: "framework-minus-apex.ravenwood-base_X8",
		defaults: ["framework-minus-apex.ravenwood-base_defaults"],
		cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 8",
		}

		java_genrule {
		name: "framework-minus-apex.ravenwood-base_X9",
		defaults: ["framework-minus-apex.ravenwood-base_defaults"],
		cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 9",
		}

		// Build framework-minus-apex.ravenwood-base without sharding.
		// We extract the various dump files from this one, rather than the sharded ones, because
		// some dumps use the output from other classes (e.g. base classes) which may not be in the
		// same shard. Also some of the dump files ("apis") may be slow even when sharded, because
		// the output contains the information from all the input classes, rather than the output classes.
		// Not using sharding is fine for this module because it's only used for collecting the
		// dump / stats files, which don't have to happen regularly.
		java_genrule {
		name: "framework-minus-apex.ravenwood-base_all",
		defaults: ["framework-minus-apex.ravenwood-base_defaults"],
		cmd: framework_minus_apex_cmd +
		"--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " +
		"--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +

		"--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +
		"--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) ",

		out: [
		"hoststubgen_framework-minus-apex_keep_all.txt",
		"hoststubgen_framework-minus-apex_dump.txt",
		"hoststubgen_framework-minus-apex_stats.csv",
		"hoststubgen_framework-minus-apex_apis.csv",
		],
		}

		// Marge all the sharded jars
		java_genrule {
		name: "framework-minus-apex.ravenwood",
		defaults: ["ravenwood-internal-only-visibility-java"],
		cmd: "$(location merge_zips) $(out) $(in)",
		tools: ["merge_zips"],
		srcs: [
		":framework-minus-apex.ravenwood-base_X0{ravenwood.jar}",
		":framework-minus-apex.ravenwood-base_X1{ravenwood.jar}",
		":framework-minus-apex.ravenwood-base_X2{ravenwood.jar}",
		":framework-minus-apex.ravenwood-base_X3{ravenwood.jar}",
		":framework-minus-apex.ravenwood-base_X4{ravenwood.jar}",
		":framework-minus-apex.ravenwood-base_X5{ravenwood.jar}",
		":framework-minus-apex.ravenwood-base_X6{ravenwood.jar}",
		":framework-minus-apex.ravenwood-base_X7{ravenwood.jar}",
		":framework-minus-apex.ravenwood-base_X8{ravenwood.jar}",
		":framework-minus-apex.ravenwood-base_X9{ravenwood.jar}",
		],
		out: [
		"framework-minus-apex.ravenwood.jar",
		],
		}
		// "framework-minus-apex" and "all-updatable-modules-system-stubs" are not
		// visible publicly. We re-export them to Ravenwood in this file.

		java_library {
		name: "services.core-for-hoststubgen",
		installable: false, // host only jar.
		static_libs: [
		"services.core",
		],
		sdk_version: "core_platform",
		visibility: ["//visibility:private"],
		}

		java_genrule {
		name: "services.core.ravenwood-base",
		tools: ["hoststubgen"],
		cmd: "$(location hoststubgen) " +
		"@$(location :ravenwood-standard-options) " +

		"--debug-log $(location hoststubgen_services.core.log) " +
		"--stats-file $(location hoststubgen_services.core_stats.csv) " +
		"--supported-api-list-file $(location hoststubgen_services.core_apis.csv) " +

		"--out-jar $(location ravenwood.jar) " +

		"--gen-keep-all-file $(location hoststubgen_services.core_keep_all.txt) " +
		"--gen-input-dump-file $(location hoststubgen_services.core_dump.txt) " +

		"--in-jar $(location :services.core-for-hoststubgen) " +
		"--policy-override-file $(location :ravenwood-services-policies) " +
		"--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",
		srcs: [
		":services.core-for-hoststubgen",
		":ravenwood-services-policies",
		":ravenwood-standard-options",
		":ravenwood-annotation-allowed-classes",
		],
		out: [
		"ravenwood.jar",

		// Following files are created just as FYI.
		"hoststubgen_services.core_keep_all.txt",
		"hoststubgen_services.core_dump.txt",

		"hoststubgen_services.core.log",
		"hoststubgen_services.core_stats.csv",
		"hoststubgen_services.core_apis.csv",
		],
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		}

		java_genrule {
		name: "services.core.ravenwood",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [
		":services.core.ravenwood-base{ravenwood.jar}",
		],
		out: [
		"services.core.ravenwood.jar",
		],
		}

		// TODO(b/313930116) This jarjar is a bit slow. We should use hoststubgen for renaming,
		// but services.core.ravenwood has complex dependencies, so it'll take more than
		// just using hoststubgen "rename"s.
		java_library {
		name: "services.core.ravenwood-jarjar",
		defaults: ["ravenwood-internal-only-visibility-java"],
		name: "framework-minus-apex-for-host",
		installable: false,
		static_libs: [
		"services.core.ravenwood",
		],
		jarjar_rules: ":ravenwood-services-jarjar-rules",
		static_libs: ["framework-minus-apex"],
		visibility: ["//frameworks/base/ravenwood"],
		}

		// Jars in "ravenwood-runtime" are set to the classpath, sorted alphabetically.
		// Rename some of the dependencies to make sure they're included in the intended order.
		java_library {
		name: "100-framework-minus-apex.ravenwood",
		defaults: ["ravenwood-internal-only-visibility-java"],
		static_libs: [
		"framework-minus-apex.ravenwood",
		],
		sdk_version: "core_platform",
		// See b/313930116. Jarjar is too slow on this jar. We use HostStubGen to do the rename.
		// jarjar_rules: ":ravenwood-framework-jarjar-rules",
		}

		java_genrule {
		// Use 200 to make sure it comes before the mainline stub ("all-updatable...").
		name: "200-kxml2-android",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [":kxml2-android"],
		out: ["200-kxml2-android.jar"],
		}

		java_genrule {
		name: "z00-all-updatable-modules-system-stubs",
		defaults: ["ravenwood-internal-only-visibility-genrule"],
		cmd: "cp $(in) $(out)",
		srcs: [":all-updatable-modules-system-stubs"],
		out: ["z00-all-updatable-modules-system-stubs.jar"],
		name: "all-updatable-modules-system-stubs-for-host",
		installable: false,
		static_libs: ["all-updatable-modules-system-stubs"],
		visibility: ["//frameworks/base/ravenwood"],
		}

apex/jobscheduler/service/aconfig/job.aconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -75,3 +75,10 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "enforce_quota_policy_to_fgs_jobs"
		namespace: "backstage_power"
		description: "Applies the normal quota policy to FGS jobs"
		bug: "341201311"
		}

apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java

+18 −7

Original line number	Diff line number	Diff line
		@@ -99,10 +99,10 @@ import java.util.function.Predicate;
		* the number of jobs or sessions that can run within the window. Regardless of bucket, apps will
		* not be allowed to run more than 20 jobs within the past 10 minutes.
		*
		* Jobs are throttled while an app is not in a foreground state. All jobs are allowed to run
		* freely when an app enters the foreground state and are restricted when the app leaves the
		* foreground state. However, jobs that are started while the app is in the TOP state do not count
		* towards any quota and are not restricted regardless of the app's state change.
		* Jobs are throttled while an app is not in a TOP or BOUND_TOP state. All jobs are allowed to run
		* freely when an app enters the TOP or BOUND_TOP state and are restricted when the app leaves those
		* states. However, jobs that are started while the app is in the TOP state do not count towards any
		* quota and are not restricted regardless of the app's state change.
		*
		* Jobs will not be throttled when the device is charging. The device is considered to be charging
		* once the {@link BatteryManager#ACTION_CHARGING} intent has been broadcast.
		@@ -567,6 +567,11 @@ public final class QuotaController extends StateController {
		ActivityManager.getService().registerUidObserver(new QcUidObserver(),
		ActivityManager.UID_OBSERVER_PROCSTATE,
		ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, null);
		if (Flags.enforceQuotaPolicyToFgsJobs()) {
		ActivityManager.getService().registerUidObserver(new QcUidObserver(),
		ActivityManager.UID_OBSERVER_PROCSTATE,
		ActivityManager.PROCESS_STATE_BOUND_TOP, null);
		}
		ActivityManager.getService().registerUidObserver(new QcUidObserver(),
		ActivityManager.UID_OBSERVER_PROCSTATE,
		ActivityManager.PROCESS_STATE_TOP, null);
		@@ -2706,6 +2711,12 @@ public final class QuotaController extends StateController {
		}
		}

		@VisibleForTesting
		int getProcessStateQuotaFreeThreshold() {
		return Flags.enforceQuotaPolicyToFgsJobs() ? ActivityManager.PROCESS_STATE_BOUND_TOP :
		ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE;
		}

		private class QcHandler extends Handler {

		QcHandler(Looper looper) {
		@@ -2832,15 +2843,15 @@ public final class QuotaController extends StateController {
		mTopAppCache.put(uid, true);
		mTopAppGraceCache.delete(uid);
		if (mForegroundUids.get(uid)) {
		// Went from FGS to TOP. We don't need to reprocess timers or
		// jobs.
		// Went from a process state with quota free to TOP. We don't
		// need to reprocess timers or jobs.
		break;
		}
		mForegroundUids.put(uid, true);
		isQuotaFree = true;
		} else {
		final boolean reprocess;
		if (procState <= ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE) {
		if (procState <= getProcessStateQuotaFreeThreshold()) {
		reprocess = !mForegroundUids.get(uid);
		mForegroundUids.put(uid, true);
		isQuotaFree = true;