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 am: 0233f238db

Browse Source 
Change-Id: I78b5dcb30bd3f773f7d7a1e300a660d679632e66
This commit is contained in:
Automerger Merge Worker
2020-02-26 03:12:50 +00:00
parent 9c0e132a0e 0233f238db
commit 9315a51ac6
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;
@UnsupportedAppUsage
public ResourcesKey(@Nullable String resDir,
@Nullable String[] splitResDirs,
@Nullable String[] overlayDirs,
@@ -85,6 +84,18 @@ public final class ResourcesKey {
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() {
return !Configuration.EMPTY.equals(mOverrideConfiguration);
}