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

am c3080d78: am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev

Browse Source 
* commit 'c3080d7855838bcbe070bddd083a5736687f130b':
  Make ResourceKey always use non-null configuration override.
This commit is contained in:
Filip Gruszczynski
2015-08-04 23:27:22 +00:00
committed by Android Git Automerger
parent d9b729c7c5 c3080d7855
commit 94858568a1
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,8 @@
package android.content.res;
import android.annotation.NonNull;
import java.util.Objects;
/** @hide */
@@ -25,27 +27,27 @@ public final class ResourcesKey {
private final int mHash;
public final int mDisplayId;
@NonNull
public final Configuration mOverrideConfiguration;
public ResourcesKey(String resDir, int displayId, Configuration overrideConfiguration,
float scale) {
mResDir = resDir;
mDisplayId = displayId;
mOverrideConfiguration = overrideConfiguration;
mOverrideConfiguration = overrideConfiguration != null
? overrideConfiguration : Configuration.EMPTY;
mScale = scale;
int hash = 17;
hash = 31 * hash + (mResDir == null ? 0 : mResDir.hashCode());
hash = 31 * hash + mDisplayId;
hash = 31 * hash + (mOverrideConfiguration != null
? mOverrideConfiguration.hashCode() : 0);
hash = 31 * hash + mOverrideConfiguration.hashCode();
hash = 31 * hash + Float.floatToIntBits(mScale);
mHash = hash;
}
public boolean hasOverrideConfiguration() {
return mOverrideConfiguration != null
&& !Configuration.EMPTY.equals(mOverrideConfiguration);
return !Configuration.EMPTY.equals(mOverrideConfiguration);
}
@Override
@@ -66,13 +68,8 @@ public final class ResourcesKey {
if (mDisplayId != peer.mDisplayId) {
return false;
}
if (mOverrideConfiguration != peer.mOverrideConfiguration) {
if (mOverrideConfiguration == null || peer.mOverrideConfiguration == null) {
return false;
}
if (!mOverrideConfiguration.equals(peer.mOverrideConfiguration)) {
return false;
}
if (!mOverrideConfiguration.equals(peer.mOverrideConfiguration)) {
return false;
}
if (mScale != peer.mScale) {
return false;