diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2020-01-29 06:57:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-29 06:57:47 +0000 |
| commit | 1e80cd76ed4b92ad71da3cd277cebff6d82e24b1 (patch) | |
| tree | 31bc8c681341e9516c3cebe8a749b359c8345e73 /core/java/android/app/ActivityThread.java | |
| parent | b37b54cca901c37e5d3c6d7aa280fdf1fdb0ba4f (diff) | |
| parent | 6115858c21f6b21b78c5e20d502572af58a69268 (diff) | |
Merge changes from topic "res-loader"
* changes:
Refactor ResourcesLoader Tests
Refactor ResourcesLoader APIs
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index d90e81f09800..c901d2a29821 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -2198,7 +2198,7 @@ public final class ActivityThread extends ClientTransactionHandler { Resources getTopLevelResources(String resDir, String[] splitResDirs, String[] overlayDirs, String[] libDirs, int displayId, LoadedApk pkgInfo) { return mResourcesManager.getResources(null, resDir, splitResDirs, overlayDirs, libDirs, - displayId, null, pkgInfo.getCompatibilityInfo(), pkgInfo.getClassLoader()); + displayId, null, pkgInfo.getCompatibilityInfo(), pkgInfo.getClassLoader(), null); } @UnsupportedAppUsage |