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

Merge "Make usage of Configuration.EMPTY safe"

Browse Source
This commit is contained in:
Andrii Kulian
2016-10-14 23:27:03 +00:00
committed by Android (Google) Code Review
parent 6b536f2200 a8a9bc5860
commit b97963475a
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/res/ResourcesKey.java
View File

@@ -59,7 +59,8 @@ public final class ResourcesKey {
mOverlayDirs = overlayDirs;
mLibDirs = libDirs;
mDisplayId = displayId;
mOverrideConfiguration = overrideConfig != null ? overrideConfig : Configuration.EMPTY;
mOverrideConfiguration = new Configuration(overrideConfig != null
? overrideConfig : Configuration.EMPTY);
mCompatInfo = compatInfo != null ? compatInfo : CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO;
int hash = 17;

10
core/java/android/view/DisplayAdjustments.java
View File

@@ -26,18 +26,20 @@ public class DisplayAdjustments {
public static final DisplayAdjustments DEFAULT_DISPLAY_ADJUSTMENTS = new DisplayAdjustments();
private volatile CompatibilityInfo mCompatInfo = CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO;
private Configuration mConfiguration = Configuration.EMPTY;
private Configuration mConfiguration;
public DisplayAdjustments() {
}
public DisplayAdjustments(Configuration configuration) {
mConfiguration = configuration;
mConfiguration = new Configuration(configuration != null
? configuration : Configuration.EMPTY);
}
public DisplayAdjustments(DisplayAdjustments daj) {
setCompatibilityInfo(daj.mCompatInfo);
mConfiguration = daj.mConfiguration;
mConfiguration = new Configuration(daj.mConfiguration != null
? daj.mConfiguration : Configuration.EMPTY);
}
public void setCompatibilityInfo(CompatibilityInfo compatInfo) {
@@ -62,7 +64,7 @@ public class DisplayAdjustments {
throw new IllegalArgumentException(
"setConfiguration: Cannot modify DEFAULT_DISPLAY_ADJUSTMENTS");
}
mConfiguration = configuration != null ? configuration : Configuration.EMPTY;
mConfiguration.setTo(configuration != null ? configuration : Configuration.EMPTY);
}
public Configuration getConfiguration() {