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

Commit 22ae8401 authored by Jim Tsai's avatar Jim Tsai Committed by Gerrit Code Review
Browse files

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

Merge "Revert^2 "Fix cts testMinimalSizeDocked fail when device supports multiwindow feature."" into main
parents ab104e29 62b22c84

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

+10 −0
Original line number Diff line number Diff line
@@ -3019,6 +3019,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
@@ -1847,6 +1847,10 @@ public final class SystemServer implements Dumpable { 
        }

        t.traceEnd();



        t.traceBegin("UpdateMetricsIfNeeded");

        mPackageManagerService.updateMetricsIfNeeded();

        t.traceEnd();



        t.traceBegin("PerformFstrimIfNeeded");

        try {

            mPackageManagerService.performFstrimIfNeeded();