Merge "[pm] fix SCAN_AS_STOPPED_SYSTEM_APP for restoreDisabledSystemPackage" into main (c6b2ad3a) · Commits · e / os / android_frameworks_base

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

+24 −20

Original line number	Diff line number	Diff line
		@@ -110,6 +110,7 @@ import android.app.backup.IBackupManager;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.IntentSender;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.DataLoaderType;
		@@ -119,7 +120,6 @@ import android.content.pm.PackageInstaller;
		import android.content.pm.PackageManager;
		import android.content.pm.PermissionGroupInfo;
		import android.content.pm.PermissionInfo;
		import android.content.pm.ResolveInfo;
		import android.content.pm.SharedLibraryInfo;
		import android.content.pm.Signature;
		import android.content.pm.SigningDetails;
		@@ -184,7 +184,9 @@ import com.android.server.pm.pkg.PackageState;
		import com.android.server.pm.pkg.PackageStateInternal;
		import com.android.server.pm.pkg.SharedLibraryWrapper;
		import com.android.server.pm.pkg.component.ComponentMutateUtils;
		import com.android.server.pm.pkg.component.ParsedActivity;
		import com.android.server.pm.pkg.component.ParsedInstrumentation;
		import com.android.server.pm.pkg.component.ParsedIntentInfo;
		import com.android.server.pm.pkg.component.ParsedPermission;
		import com.android.server.pm.pkg.component.ParsedPermissionGroup;
		import com.android.server.pm.pkg.parsing.ParsingPackageUtils;
		@@ -207,6 +209,7 @@ import java.security.cert.CertificateException;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Map;
		import java.util.Set;
		@@ -3936,23 +3939,6 @@ final class InstallPackageHelper {
		}
		}

		// If this is a system app we hadn't seen before, and this is a first boot or OTA,
		// we need to unstop it if it doesn't have a launcher entry.
		if (mPm.mShouldStopSystemPackagesByDefault && scanResult.mRequest.mPkgSetting == null
		&& ((scanFlags & SCAN_FIRST_BOOT_OR_UPGRADE) != 0)
		&& ((scanFlags & SCAN_AS_SYSTEM) != 0)) {
		final Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
		launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
		launcherIntent.setPackage(parsedPackage.getPackageName());
		final List<ResolveInfo> launcherActivities =
		mPm.snapshotComputer().queryIntentActivitiesInternal(launcherIntent, null,
		PackageManager.MATCH_DIRECT_BOOT_AWARE
		\| PackageManager.MATCH_DIRECT_BOOT_UNAWARE, 0);
		if (launcherActivities.isEmpty()) {
		scanResult.mPkgSetting.setStopped(false, 0);
		}
		}

		if (mIncrementalManager != null && isIncrementalPath(parsedPackage.getPath())) {
		if (scanResult.mPkgSetting != null && scanResult.mPkgSetting.isLoading()) {
		// Continue monitoring loading progress of active incremental packages
		@@ -4325,6 +4311,7 @@ final class InstallPackageHelper {
		// - It's an APEX or overlay package since stopped state does not affect them.
		// - It is enumerated with a <initial-package-state> tag having the stopped attribute
		// set to false
		// - It doesn't have a launcher entry which means the user doesn't have a way to unstop it
		final boolean isApexPkg = (scanFlags & SCAN_AS_APEX) != 0;
		if (mPm.mShouldStopSystemPackagesByDefault
		&& scanSystemPartition
		@@ -4333,8 +4320,9 @@ final class InstallPackageHelper {
		&& !parsedPackage.isOverlayIsStatic()
		) {
		String packageName = parsedPackage.getPackageName();
		if (!mPm.mInitialNonStoppedSystemPackages.contains(packageName)
		&& !"android".contentEquals(packageName)) {
		if (!"android".contentEquals(packageName)
		&& !mPm.mInitialNonStoppedSystemPackages.contains(packageName)
		&& hasLauncherEntry(parsedPackage)) {
		scanFlags \|= SCAN_AS_STOPPED_SYSTEM_APP;
		}
		}
		@@ -4344,6 +4332,22 @@ final class InstallPackageHelper {
		return new Pair<>(scanResult, shouldHideSystemApp);
		}

		private static boolean hasLauncherEntry(ParsedPackage parsedPackage) {
		final HashSet<String> categories = new HashSet<>();
		categories.add(Intent.CATEGORY_LAUNCHER);
		final List<ParsedActivity> activities = parsedPackage.getActivities();
		for (int indexActivity = 0; indexActivity < activities.size(); indexActivity++) {
		final List<ParsedIntentInfo> intents = activities.get(indexActivity).getIntents();
		for (int indexIntent = 0; indexIntent < intents.size(); indexIntent++) {
		final IntentFilter intentFilter = intents.get(indexIntent).getIntentFilter();
		if (intentFilter != null && intentFilter.matchCategories(categories) == null) {
		return true;
		}
		}
		}
		return false;
		}

		/**
		* Returns if forced apk verification can be skipped for the whole package, including splits.
		*/