Merge "Fixed DisplayCutout flaky test"

2020-03-10 06:35:51 +00:00
parent af3061e58e a62e449f6b
commit 74c6a9785a
1 changed files with 3 additions and 2 deletions
--- a/core/java/android/view/DisplayCutout.java
+++ b/core/java/android/view/DisplayCutout.java
@@ -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;