Snap for 7588338 from 94081b36877865c8e359c14407e0f590e1cb1c91 to sc-release (e898e566) · Commits · e / os / android_frameworks_base

Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -296,6 +296,7 @@ java_defaults {
		],
		include_dirs: [
		"frameworks/av/aidl",
		"frameworks/native/libs/permission/aidl",
		"packages/modules/Connectivity/framework/aidl-export",
		],
		},
		@@ -537,6 +538,7 @@ stubs_defaults {
		],
		include_dirs: [
		"frameworks/av/aidl",
		"frameworks/native/libs/permission/aidl",
		"packages/modules/Connectivity/framework/aidl-export",
		],
		},

ApiDocs.bp

+8 −2

Original line number	Diff line number	Diff line
		@@ -113,7 +113,10 @@ stubs_defaults {
		// TODO(b/169090544): remove below aidl includes.
		aidl: {
		local_include_dirs: ["media/aidl"],
		include_dirs: ["frameworks/av/aidl"],
		include_dirs: [
		"frameworks/av/aidl",
		"frameworks/native/libs/permission/aidl",
		],
		},
		}

		@@ -199,7 +202,10 @@ doc_defaults {
		// TODO(b/169090544): remove below aidl includes.
		aidl: {
		local_include_dirs: ["media/aidl"],
		include_dirs: ["frameworks/av/aidl"],
		include_dirs: [
		"frameworks/av/aidl",
		"frameworks/native/libs/permission/aidl",
		],
		},
		}

StubLibraries.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -410,7 +410,7 @@ java_library {
		],
		static_libs: [
		"android-non-updatable.stubs.module_lib",
		"art.module.public.api.stubs",
		"art.module.public.api.stubs.module_lib",
		],
		dist: {
		dir: "apistubs/android/module-lib",

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

+8 −10

Original line number	Diff line number	Diff line
		@@ -690,7 +690,6 @@ public class JobSchedulerService extends com.android.server.SystemService

		@VisibleForTesting
		class PendingJobComparator implements Comparator<JobStatus> {
		private final SparseBooleanArray mUidHasEjCache = new SparseBooleanArray();
		private final SparseLongArray mEarliestRegEnqueueTimeCache = new SparseLongArray();

		/**
		@@ -699,14 +698,11 @@ public class JobSchedulerService extends com.android.server.SystemService
		@GuardedBy("mLock")
		@VisibleForTesting
		void refreshLocked() {
		mUidHasEjCache.clear();
		mEarliestRegEnqueueTimeCache.clear();
		for (int i = 0; i < mPendingJobs.size(); ++i) {
		final JobStatus job = mPendingJobs.get(i);
		final int uid = job.getSourceUid();
		if (job.isRequestedExpeditedJob()) {
		mUidHasEjCache.put(uid, true);
		} else {
		if (!job.isRequestedExpeditedJob()) {
		final long earliestEnqueueTime =
		mEarliestRegEnqueueTimeCache.get(uid, Long.MAX_VALUE);
		mEarliestRegEnqueueTimeCache.put(uid,
		@@ -736,9 +732,7 @@ public class JobSchedulerService extends com.android.server.SystemService
		return o1EJ ? -1 : 1;
		}
		}
		final boolean uid1HasEj = mUidHasEjCache.get(o1.getSourceUid());
		final boolean uid2HasEj = mUidHasEjCache.get(o2.getSourceUid());
		if ((uid1HasEj \|\| uid2HasEj) && (o1EJ \|\| o2EJ)) {
		if (o1EJ \|\| o2EJ) {
		// We MUST prioritize EJs ahead of regular jobs within a single app. Since we do
		// that, in order to satisfy the transitivity constraint of the comparator, if
		// any UID has an EJ, we must ensure that the EJ is ordered ahead of the regular
		@@ -759,9 +753,13 @@ public class JobSchedulerService extends com.android.server.SystemService
		} else if (uid1EarliestRegEnqueueTime > uid2EarliestRegEnqueueTime) {
		return 1;
		}
		} else if (o1EJ && uid1EarliestRegEnqueueTime < o2.enqueueTime) {
		} else if (o1EJ && uid1EarliestRegEnqueueTime <= o2.enqueueTime) {
		// Include = to ensure that if we sorted an EJ ahead of a regular job at time X
		// then we make sure to sort it ahead of all regular jobs at time X.
		return -1;
		} else if (o2EJ && uid2EarliestRegEnqueueTime < o1.enqueueTime) {
		} else if (o2EJ && uid2EarliestRegEnqueueTime <= o1.enqueueTime) {
		// Include = to ensure that if we sorted an EJ ahead of a regular job at time X
		// then we make sure to sort it ahead of all regular jobs at time X.
		return 1;
		}
		}

core/api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -3176,7 +3176,6 @@ package android.window {

		public final class SplashScreenView extends android.widget.FrameLayout {
		method @Nullable public android.view.View getBrandingView();
		method @ColorInt public int getIconBackgroundColor();
		}

		public final class StartingWindowInfo implements android.os.Parcelable {