Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed DisplayCutout flaky test" am: 74c6a9785a

Browse Source 
Change-Id: I0c63c50aa2a492decd0223e2b634766bc517976c
This commit is contained in:
Automerger Merge Worker
2020-03-10 06:58:00 +00:00
parent a884635617 74c6a9785a
commit d4d4909f67
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/DisplayCutout.java
View File

@@ -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;