Merge "Add missing return in DexManager" (dc61d1b2) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -432,7 +432,7 @@ public class DexManager {
		// Ignore framework code.
		// TODO(calin): is there a better way to detect it?
		if (dexPath.startsWith("/system/framework/")) {
		new DexSearchResult("framework", DEX_SEARCH_NOT_FOUND);
		return new DexSearchResult("framework", DEX_SEARCH_NOT_FOUND);
		}

		// First, check if the package which loads the dex file actually owns it.

+9 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,6 @@ public class DexManagerTests {

		@Before
		public void setup() {

		mUser0 = 0;
		mUser1 = 1;

		@@ -352,6 +351,15 @@ public class DexManagerTests {
		assertNull(pui);
		}

		@Test
		public void testNotifyFrameworkLoad() {
		String frameworkDex = "/system/framework/com.android.location.provider.jar";
		// Load a dex file from framework.
		notifyDexLoad(mFooUser0, Arrays.asList(frameworkDex), mUser0);
		// The dex file should not be recognized as a package.
		assertNull(mDexManager.getPackageUseInfo(frameworkDex));
		}

		private void assertSecondaryUse(TestData testData, PackageUseInfo pui,
		List<String> secondaries, boolean isUsedByOtherApps, int ownerUserId) {
		for (String dex : secondaries) {