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

Commit 253eda20 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 am: 04ef19ec

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

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

parents 7a4b6865 04ef19ec

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
		@@ -1928,6 +1928,10 @@ public final class SystemServer implements Dumpable {
		}
		t.traceEnd();

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

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