diff --git a/core/java/android/view/DisplayCutout.java b/core/java/android/view/DisplayCutout.java index e77d7191d5b89..598c1dc2c39ff 100644 --- 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 result = new Pair<>(p, cutout); synchronized (CACHE_LOCK) { - sCachedSpec = spec; + sCachedSpec = specToCache; sCachedDisplayWidth = displayWidth; sCachedDisplayHeight = displayHeight; sCachedDensity = density;