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

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

Change-Id: I53fe134bcb9ac99087e880b944e29dd7635ffc14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Robin Lee
2023-05-22 20:25:48 +00:00
committed by Automerger Merge Worker

View File

@@ -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("----------------------");