diff options
| author | Charles Chen <charlesccchen@google.com> | 2020-03-23 18:18:36 +0800 |
|---|---|---|
| committer | Charles Chen <charlesccchen@google.com> | 2020-03-24 09:56:30 +0000 |
| commit | 38325f629045e71a5aeb5120ce4a034d4246e4bd (patch) | |
| tree | bea259dcbd9642887695e28b9b88b769f05e5751 /core/java/android/app/ContextImpl.java | |
| parent | 8f36aba1fbd92561475487a81bea71dc1c85e2f6 (diff) | |
Rename createBaseActivityResources to createBaseTokenResources
Because this API is also used in WindowContext
Test: build & run
Bug: 147791225
Change-Id: Ibf4704234dc4e0d4bd2c1b91c78cab97a0c739f8
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 9ccfe8df14c2..17fd4efec9cc 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -2414,8 +2414,7 @@ class ContextImpl extends Context { : CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO; final List<ResourcesLoader> loaders = mResources.getLoaders(); - // TODO(b/128338354): Rename to createTokenResources - return mResourcesManager.createBaseActivityResources(mToken, resDir, splitResDirs, + return mResourcesManager.createBaseTokenResources(mToken, resDir, splitResDirs, overlayDirs, libDirs, displayId, null /* overrideConfig */, compatInfo, mClassLoader, loaders); } @@ -2684,7 +2683,7 @@ class ContextImpl extends Context { // Create the base resources for which all configuration contexts for this Activity // will be rebased upon. - context.setResources(resourcesManager.createBaseActivityResources(activityToken, + context.setResources(resourcesManager.createBaseTokenResources(activityToken, packageInfo.getResDir(), splitDirs, packageInfo.getOverlayDirs(), |