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

This commit is contained in:
TreeHugger Robot
2017-07-07 01:38:01 +00:00
committed by Android (Google) Code Review

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