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

Commit d4d4909f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fixed DisplayCutout flaky test" am: 74c6a978 

Change-Id: I0c63c50aa2a492decd0223e2b634766bc517976c
parents a8846356 74c6a978

core/java/android/view/DisplayCutout.java

+3 −2
Original line number Diff line number Diff line
@@ -638,7 +638,8 @@ public final class DisplayCutout { 
                return sCachedCutout;

            }

        }

        spec = spec.trim();

        final String specToCache = spec.trim();

        spec = specToCache;

        final float offsetX;

        if (spec.endsWith(RIGHT_MARKER)) {

            offsetX = displayWidth;
@@ -709,7 +710,7 @@ public final class DisplayCutout { 


        final Pair<Path, DisplayCutout> result = new Pair<>(p, cutout);

        synchronized (CACHE_LOCK) {

            sCachedSpec = spec;

            sCachedSpec = specToCache;

            sCachedDisplayWidth = displayWidth;

            sCachedDisplayHeight = displayHeight;

            sCachedDensity = density;