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

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

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

2 files changed, 0 insertions, 14 deletions

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 340daf1f3d9a..65bb701563a8 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -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) {
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 1b0b1ad131ac..aa63c4a4a91f 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1928,10 +1928,6 @@ public final class SystemServer implements Dumpable {
         }
         t.traceEnd();
 
-        t.traceBegin("UpdateMetricsIfNeeded");
-        mPackageManagerService.updateMetricsIfNeeded();
-        t.traceEnd();
-
         t.traceBegin("PerformFstrimIfNeeded");
         try {
             mPackageManagerService.performFstrimIfNeeded();