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

Merge "Restore UnsupportedAppUsage method call" into rvc-dev am: da043aee24

Browse Source 
Change-Id: I40968d188143e87e02a0600c35a5c4d1d17b15d8
This commit is contained in:
Automerger Merge Worker
2020-02-26 03:06:58 +00:00
parent 647d514d47 da043aee24
commit d42b6fa9b9
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,6 @@ public final class ResourcesKey {
private final int mHash; private final int mHash;
@UnsupportedAppUsage
public ResourcesKey(@Nullable String resDir, public ResourcesKey(@Nullable String resDir,
@Nullable String[] splitResDirs, @Nullable String[] splitResDirs,
@Nullable String[] overlayDirs, @Nullable String[] overlayDirs,
@@ -85,6 +84,18 @@ public final class ResourcesKey {
mHash = hash; mHash = hash;
} }
@UnsupportedAppUsage
public ResourcesKey(@Nullable String resDir,
@Nullable String[] splitResDirs,
@Nullable String[] overlayDirs,
@Nullable String[] libDirs,
int displayId,
@Nullable Configuration overrideConfig,
@Nullable CompatibilityInfo compatInfo) {
this(resDir, splitResDirs, overlayDirs, libDirs, displayId, overrideConfig, compatInfo,
null);
}
public boolean hasOverrideConfiguration() { public boolean hasOverrideConfiguration() {
return !Configuration.EMPTY.equals(mOverrideConfiguration); return !Configuration.EMPTY.equals(mOverrideConfiguration);
} }