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

Merge "Fix Configuration#updateFrom() when assetsSeq doesn't change" into oc-dr1-dev

Browse Source 
am: da075a9681

Change-Id: Ic4b22dab0f73fb91b23946946b6e2d30727606df
This commit is contained in:
Adam Lesinski
2017-07-07 02:50:55 +00:00
committed by android-build-merger
parent fec36c27f2 da075a9681
commit 204f662f31
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/res/Configuration.java
View File

@@ -1291,7 +1291,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration
changed |= ActivityInfo.CONFIG_SCREEN_SIZE;
setAppBounds(delta.appBounds);
}
if (delta.assetsSeq != ASSETS_SEQ_UNDEFINED) {
if (delta.assetsSeq != ASSETS_SEQ_UNDEFINED && delta.assetsSeq != assetsSeq) {
changed |= ActivityInfo.CONFIG_ASSETS_PATHS;
assetsSeq = delta.assetsSeq;
}