diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-02-09 17:05:34 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-02-09 17:05:34 +0000 |
commit | 419f4eeb6c9ab1e3813a87cdd283c234d823d0a6 (patch) | |
tree | dfbb9a3e1698a445d0c4f26352733033c0ec8335 /apct-tests/perftests | |
parent | fd20e23658af6d0980323ea9616574142a0fa74b (diff) | |
parent | da9ee1406e7c697f0ea991f7877c8526aed9b5e9 (diff) |
Merge "Add overlayPaths to ApplicationInfo" into sc-dev
Diffstat (limited to 'apct-tests/perftests')
-rw-r--r-- | apct-tests/perftests/core/src/android/app/ResourcesManagerPerfTest.java | 2 | ||||
-rw-r--r-- | apct-tests/perftests/core/src/android/app/ResourcesThemePerfTest.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/apct-tests/perftests/core/src/android/app/ResourcesManagerPerfTest.java b/apct-tests/perftests/core/src/android/app/ResourcesManagerPerfTest.java index d3938f4c0926..afd8e2948c41 100644 --- a/apct-tests/perftests/core/src/android/app/ResourcesManagerPerfTest.java +++ b/apct-tests/perftests/core/src/android/app/ResourcesManagerPerfTest.java @@ -77,7 +77,7 @@ public class ResourcesManagerPerfTest { } private void getResourcesForPath(String path) { - ResourcesManager.getInstance().getResources(null, path, null, null, null, + ResourcesManager.getInstance().getResources(null, path, null, null, null, null, Display.DEFAULT_DISPLAY, null, sContext.getResources().getCompatibilityInfo(), null, null); } diff --git a/apct-tests/perftests/core/src/android/app/ResourcesThemePerfTest.java b/apct-tests/perftests/core/src/android/app/ResourcesThemePerfTest.java index f4c0a172710b..45c723bea9db 100644 --- a/apct-tests/perftests/core/src/android/app/ResourcesThemePerfTest.java +++ b/apct-tests/perftests/core/src/android/app/ResourcesThemePerfTest.java @@ -95,8 +95,9 @@ public class ResourcesThemePerfTest { ? Configuration.ORIENTATION_LANDSCAPE : Configuration.ORIENTATION_PORTRAIT; Resources destResources = resourcesManager.getResources(null, ai.sourceDir, - ai.splitSourceDirs, ai.resourceDirs, ai.sharedLibraryFiles, Display.DEFAULT_DISPLAY, - c, mContext.getResources().getCompatibilityInfo(), null, null); + ai.splitSourceDirs, ai.resourceDirs, ai.overlayPaths, ai.sharedLibraryFiles, + Display.DEFAULT_DISPLAY, c, mContext.getResources().getCompatibilityInfo(), + null, null); Assert.assertNotEquals(destResources.getAssets(), mContext.getAssets()); Resources.Theme destTheme = destResources.newTheme(); |