Snap for 11130229 from 02e8b4da9f117c85b4ad408b9f0dc39ced715a6e to 24Q1-release (837d28ab) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+17 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ aconfig_srcjars = [
		":android.hardware.usb.flags-aconfig-java{.generated_srcjars}",
		":android.tracing.flags-aconfig-java{.generated_srcjars}",
		":android.appwidget.flags-aconfig-java{.generated_srcjars}",
		":android.webkit.flags-aconfig-java{.generated_srcjars}",
		]

		filegroup {
		@@ -762,3 +763,19 @@ java_aconfig_library {
		aconfig_declarations: "android.appwidget.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// WebView
		aconfig_declarations {
		name: "android.webkit.flags-aconfig",
		package: "android.webkit",
		srcs: [
		"core/java/android/webkit/*.aconfig",
		"services/core/java/com/android/server/webkit/*.aconfig",
		],
		}

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

Ravenwood.bp

+0 −2

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ java_genrule {
		cmd: "$(location hoststubgen) " +
		"@$(location ravenwood/ravenwood-standard-options.txt) " +

		"--out-stub-jar $(location ravenwood_stub.jar) " +
		"--out-impl-jar $(location ravenwood.jar) " +

		"--gen-keep-all-file $(location hoststubgen_keep_all.txt) " +
		@@ -49,7 +48,6 @@ java_genrule {
		],
		out: [
		"ravenwood.jar",
		"ravenwood_stub.jar", // It's not used. TODO: Update hoststubgen to make it optional.

		// Following files are created just as FYI.
		"hoststubgen_keep_all.txt",

apct-tests/perftests/core/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@ android_test {
		errorprone: {
		javacflags: [
		"-Xep:ReturnValueIgnored:WARN",
		"-Xep:UnnecessaryStringBuilder:OFF",
		],
		},
		}

apct-tests/perftests/windowmanager/src/android/wm/RelayoutPerfTest.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -128,6 +128,7 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase
		final MergedConfiguration mOutMergedConfiguration = new MergedConfiguration();
		final InsetsState mOutInsetsState = new InsetsState();
		final InsetsSourceControl.Array mOutControls = new InsetsSourceControl.Array();
		final Bundle mOutBundle = new Bundle();
		final IWindow mWindow;
		final View mView;
		final WindowManager.LayoutParams mParams;
		@@ -136,7 +137,7 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase
		final SurfaceControl mOutSurfaceControl;

		final IntSupplier mViewVisibility;

		int mRelayoutSeq;
		int mFlags;

		RelayoutRunner(Activity activity, IWindow window, IntSupplier visibilitySupplier) {
		@@ -152,10 +153,11 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase
		void runBenchmark(BenchmarkState state) throws RemoteException {
		final IWindowSession session = WindowManagerGlobal.getWindowSession();
		while (state.keepRunning()) {
		mRelayoutSeq++;
		session.relayout(mWindow, mParams, mWidth, mHeight,
		mViewVisibility.getAsInt(), mFlags, 0 /* seq /, 0 / lastSyncSeqId */,
		mViewVisibility.getAsInt(), mFlags, mRelayoutSeq, 0 /* lastSyncSeqId */,
		mOutFrames, mOutMergedConfiguration, mOutSurfaceControl, mOutInsetsState,
		mOutControls, new Bundle());
		mOutControls, mOutBundle);
		}
		}
		}

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

+16 −16

Original line number	Diff line number	Diff line
		@@ -598,7 +598,6 @@ public final class JobStatus {
		long lastSuccessfulRunTime, long lastFailedRunTime, long cumulativeExecutionTimeMs,
		int internalFlags,
		int dynamicConstraints) {
		this.job = job;
		this.callingUid = callingUid;
		this.standbyBucket = standbyBucket;
		mNamespace = namespace;
		@@ -626,6 +625,22 @@ public final class JobStatus {
		this.sourceTag = tag;
		}

		// This needs to be done before setting the field variable.
		if (job.getRequiredNetwork() != null) {
		// Later, when we check if a given network satisfies the required
		// network, we need to know the UID that is requesting it, so push
		// the source UID into place.
		final JobInfo.Builder builder = new JobInfo.Builder(job);
		builder.setRequiredNetwork(new NetworkRequest.Builder(job.getRequiredNetwork())
		.setUids(Collections.singleton(new Range<>(this.sourceUid, this.sourceUid)))
		.build());
		// Don't perform validation checks at this point since we've already passed the
		// initial validation check.
		job = builder.build(false, false);
		}

		this.job = job;

		final String bnNamespace = namespace == null ? "" : "@" + namespace + "@";
		this.batteryName = this.sourceTag != null
		? bnNamespace + this.sourceTag + ":" + job.getService().getPackageName()
		@@ -708,21 +723,6 @@ public final class JobStatus {

		updateNetworkBytesLocked();

		if (job.getRequiredNetwork() != null) {
		// Later, when we check if a given network satisfies the required
		// network, we need to know the UID that is requesting it, so push
		// our source UID into place.
		final JobInfo.Builder builder = new JobInfo.Builder(job);
		final NetworkRequest.Builder requestBuilder =
		new NetworkRequest.Builder(job.getRequiredNetwork());
		requestBuilder.setUids(
		Collections.singleton(new Range<Integer>(this.sourceUid, this.sourceUid)));
		builder.setRequiredNetwork(requestBuilder.build());
		// Don't perform validation checks at this point since we've already passed the
		// initial validation check.
		job = builder.build(false, false);
		}

		updateMediaBackupExemptionStatus();
		}