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

Commit e93cc867 authored by ELIYAZ MOMIN's avatar ELIYAZ MOMIN Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: Ic7a1627d6f452a8799002e2509c414a7a432442e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 17b0bd65 f5f46e54

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

+0 −10
Original line number Diff line number Diff line
@@ -3020,16 +3020,6 @@ 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

+0 −4
Original line number Diff line number Diff line
@@ -1880,10 +1880,6 @@ public final class SystemServer implements Dumpable { 
        }

        t.traceEnd();



        t.traceBegin("UpdateMetricsIfNeeded");

        mPackageManagerService.updateMetricsIfNeeded();

        t.traceEnd();



        t.traceBegin("PerformFstrimIfNeeded");

        try {

            mPackageManagerService.performFstrimIfNeeded();