Merge "Merge "Restore UnsupportedAppUsage method call" into rvc-dev am:... (960a1901) · Commits · e / os / android_frameworks_base

core/java/android/content/res/ResourcesKey.java

+12 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}