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

Merge "Don't clone the locale redundantly in Configuration.setTo()" into rvc-qpr-dev am: 786165bae0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12152573

Change-Id: Ia37b90f198ce8ca923ff5a1909d08225d2e30d35
This commit is contained in:
TreeHugger Robot
2020-08-03 19:07:19 +00:00
committed by Automerger Merge Worker
parent ce6c8c7170 786165bae0
commit 986681192e
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,6 @@ import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.TestApi;
import android.app.UiModeManager;
import android.app.WindowConfiguration;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.LocaleProto;
@@ -928,7 +927,13 @@ public final class Configuration implements Parcelable, Comparable<Configuration
fontScale = o.fontScale;
mcc = o.mcc;
mnc = o.mnc;
locale = o.locale == null ? null : (Locale) o.locale.clone();
if (o.locale == null) {
locale = null;
} else if (!o.locale.equals(locale)) {
// Only clone a new Locale instance if we need to: the clone() is
// both CPU and GC intensive.
locale = (Locale) o.locale.clone();
}
o.fixUpLocaleList();
mLocaleList = o.mLocaleList;
userSetLocale = o.userSetLocale;
@@ -1624,7 +1629,10 @@ public final class Configuration implements Parcelable, Comparable<Configuration
if ((mask & ActivityInfo.CONFIG_LOCALE) != 0) {
mLocaleList = delta.mLocaleList;
if (!mLocaleList.isEmpty()) {
locale = (Locale) delta.locale.clone();
if (!delta.locale.equals(locale)) {
// Don't churn a new Locale clone unless we're actually changing it
locale = (Locale) delta.locale.clone();
}
}
}
if ((mask & ActivityInfo.CONFIG_LAYOUT_DIRECTION) != 0) {