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

Commit 1882a859 authored Dec 11, 2024 by Jim Tsai Committed by Automerger Merge Worker Dec 11, 2024

Merge "Revert^2 "Fix cts testMinimalSizeDocked fail when device supports...

Merge "Revert^2 "Fix cts testMinimalSizeDocked fail when device supports multiwindow feature."" into main am: 22ae8401 am: 14174386

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

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

parents 187b6d60 14174386

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

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

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