Merge "resolved conflicts for f005d55f to master" (97bb1ad7) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerService.java

+0 −35

Original line number	Diff line number	Diff line
		@@ -6156,41 +6156,6 @@ public class PackageManagerService extends IPackageManager.Stub {
		it.remove();
		}
		}
		// Give priority to system apps.
		for (Iterator<PackageParser.Package> it = pkgs.iterator(); it.hasNext();) {
		PackageParser.Package pkg = it.next();
		if (isSystemApp(pkg) && !pkg.isUpdatedSystemApp()) {
		if (DEBUG_DEXOPT) {
		Log.i(TAG, "Adding system app " + sortedPkgs.size() + ": " + pkg.packageName);
		}
		sortedPkgs.add(pkg);
		it.remove();
		}
		}
		// Give priority to updated system apps.
		for (Iterator<PackageParser.Package> it = pkgs.iterator(); it.hasNext();) {
		PackageParser.Package pkg = it.next();
		if (pkg.isUpdatedSystemApp()) {
		if (DEBUG_DEXOPT) {
		Log.i(TAG, "Adding updated system app " + sortedPkgs.size() + ": " + pkg.packageName);
		}
		sortedPkgs.add(pkg);
		it.remove();
		}
		}
		// Give priority to apps that listen for boot complete.
		intent = new Intent(Intent.ACTION_BOOT_COMPLETED);
		pkgNames = getPackageNamesForIntent(intent, UserHandle.USER_SYSTEM);
		for (Iterator<PackageParser.Package> it = pkgs.iterator(); it.hasNext();) {
		PackageParser.Package pkg = it.next();
		if (pkgNames.contains(pkg.packageName)) {
		if (DEBUG_DEXOPT) {
		Log.i(TAG, "Adding boot app " + sortedPkgs.size() + ": " + pkg.packageName);
		}
		sortedPkgs.add(pkg);
		it.remove();
		}
		}
		// Filter out packages that aren't recently used.
		filterRecentlyUsedApps(pkgs);
		// Add all remaining apps.