diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2020-02-21 10:42:50 -0800 |
|---|---|---|
| committer | Ryan Mitchell <rtmitchell@google.com> | 2020-02-25 22:10:22 +0000 |
| commit | 93f2b3f9a21407fff6b2187949cc5f318ce05570 (patch) | |
| tree | aea9a351b9477f41a2a5aed03408afe9d1f31f91 /core/java/android | |
| parent | 969e1e2759c0fad8862df2a9b4467e2e0bfb4594 (diff) | |
Restore UnsupportedAppUsage method call
4579c0aea24d74e0bb262b9019ab14a1fc96c1bb changed the method signature
of the constructor of ResourcesKey, which is marked
UnsupportedappUsage. Restore the previous signature and provide a new
constructor that is hidden.
Bug: 147359613
Test: none
Change-Id: I391167e9064b1d88f4ad75200a190e5e3b0968cf
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/res/ResourcesKey.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/core/java/android/content/res/ResourcesKey.java b/core/java/android/content/res/ResourcesKey.java index 9e40f46c3c21..9da0f20d1006 100644 --- a/core/java/android/content/res/ResourcesKey.java +++ b/core/java/android/content/res/ResourcesKey.java @@ -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); } |