Merge "[DexManager] Fix off-by-N error in DexManager when reporting dex loads" (2fd4a1c4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/dex/DexManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -229,6 +229,7 @@ public class DexManager {
		// If the dex file is the primary apk (or a split) and not isUsedByOtherApps
		// do not record it. This case does not bring any new usable information
		// and can be safely skipped.
		dexPathIndex++;
		continue;
		}

+25 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,31 @@ public class DexManagerTests {
		assertHasDclInfo(mFooUser0, mFooUser0, fooSecondaries);
		}

		@Test
		public void testNotifyPrimaryAndSecondary() {
		List<String> dexFiles = mFooUser0.getBaseAndSplitDexPaths();
		List<String> secondaries = mFooUser0.getSecondaryDexPaths();
		int baseAndSplitCount = dexFiles.size();
		dexFiles.addAll(secondaries);

		notifyDexLoad(mFooUser0, dexFiles, mUser0);

		PackageUseInfo pui = getPackageUseInfo(mFooUser0);
		assertIsUsedByOtherApps(mFooUser0, pui, false);
		assertEquals(secondaries.size(), pui.getDexUseInfoMap().size());

		String[] allExpectedContexts = DexoptUtils.processContextForDexLoad(
		Arrays.asList(mFooUser0.mClassLoader),
		Arrays.asList(String.join(File.pathSeparator, dexFiles)));
		String[] secondaryExpectedContexts = Arrays.copyOfRange(allExpectedContexts,
		baseAndSplitCount, dexFiles.size());

		assertSecondaryUse(mFooUser0, pui, secondaries, /isUsedByOtherApps/false, mUser0,
		secondaryExpectedContexts);

		assertHasDclInfo(mFooUser0, mFooUser0, secondaries);
		}

		@Test
		public void testNotifySecondaryForeign() {
		// Foo loads bar secondary files.