Revert "Fix cts testMinimalSizeDocked fail when device supports multiwindow feature."

This reverts commit 507336fe487a8beb0360f74aa0ef526cf326b62a.

Reason for revert: <Potential culprit for b/382211612 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Change-Id: Id4ab9af1fbc11e87078975ff480c345672bfc58a

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 34a15fdb2df5..69c78eb155eb 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -3019,16 +3019,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 4f0234135e27..cdca948f91ac 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1842,10 +1842,6 @@ public final class SystemServer implements Dumpable {
         }
         t.traceEnd();
 
-        t.traceBegin("UpdateMetricsIfNeeded");
-        mPackageManagerService.updateMetricsIfNeeded();
-        t.traceEnd();
-
         t.traceBegin("PerformFstrimIfNeeded");
         try {
             mPackageManagerService.performFstrimIfNeeded();