Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04ef19ec authored Dec 04, 2024 by Jim Tsai Committed by Automerger Merge Worker Dec 04, 2024

Merge "Fix cts testMinimalSizeDocked fail when device supports multiwindow...

Merge "Fix cts testMinimalSizeDocked fail when device supports multiwindow feature." into main am: 4562a601

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3273971

Change-Id: Ia3482cb8bf97f33a1143502402b023886b89f547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6877bf0f 4562a601

services/core/java/com/android/server/pm/PackageManagerService.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -3020,6 +3020,16 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		mDexOptHelper.performPackageDexOptUpgradeIfNeeded();
		}

		public void updateMetricsIfNeeded() {
		final DisplayManager displayManager = mContext.getSystemService(DisplayManager.class);
		if (displayManager != null) {
		final Display display = displayManager.getDisplay(Display.DEFAULT_DISPLAY);
		if (display != null) {
		display.getMetrics(mMetrics);
		}
		}
		}

		private void notifyPackageUseInternal(String packageName, int reason) {
		long time = System.currentTimeMillis();
		synchronized (mLock) {

services/java/com/android/server/SystemServer.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1880,6 +1880,10 @@ public final class SystemServer implements Dumpable {
		}
		t.traceEnd();

		t.traceBegin("UpdateMetricsIfNeeded");
		mPackageManagerService.updateMetricsIfNeeded();
		t.traceEnd();

		t.traceBegin("PerformFstrimIfNeeded");
		try {
		mPackageManagerService.performFstrimIfNeeded();