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

Commit 3baa1d68 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Avoid saving result from WeakHashMap.size()" into udc-dev am: 5a4d1bd9 

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



Change-Id: Ie7fe441310a029028677a91953740f3de8e5cc32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 903ab0ae 5a4d1bd9

core/java/android/view/SurfaceControlRegistry.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ public class SurfaceControlRegistry { 
    private static class DefaultReporter implements Reporter {

        public void onMaxLayersExceeded(WeakHashMap<SurfaceControl, Long> surfaceControls,

                int limit, PrintWriter pw) {

            final int size = Math.min(surfaceControls.size(), limit);

            final long now = SystemClock.elapsedRealtime();

            final ArrayList<Map.Entry<SurfaceControl, Long>> entries = new ArrayList<>();

            for (Map.Entry<SurfaceControl, Long> entry : surfaceControls.entrySet()) {
@@ -71,6 +70,7 @@ public class SurfaceControlRegistry { 
            // Sort entries by time registered when dumping

            // TODO: Or should it sort by name?

            entries.sort((o1, o2) -> (int) (o1.getValue() - o2.getValue()));

            final int size = Math.min(entries.size(), limit);



            pw.println("SurfaceControlRegistry");

            pw.println("----------------------");