Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ie865aba7,Ic51a9ceb into udc-dev am: 85b959f478 am: da088f2e0d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24134363

Change-Id: I1554f94865ab5e4fe804d0ab150a49dc9d02ffef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-21 21:52:09 +00:00
committed by Automerger Merge Worker
parent c9f7876f57 da088f2e0d
commit 2f91a8d3b2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/pm/InstallPackageHelper.java
View File

@@ -4300,7 +4300,8 @@ 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
// - It doesn't have an enabled and exported launcher activity, which means the user
// wouldn't have a way to un-stop it
final boolean isApexPkg = (scanFlags & SCAN_AS_APEX) != 0;
if (mPm.mShouldStopSystemPackagesByDefault
&& scanSystemPartition
@@ -4326,7 +4327,11 @@ final class InstallPackageHelper {
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();
final ParsedActivity activity = activities.get(indexActivity);
if (!activity.isEnabled() || !activity.isExported()) {
continue;
}
final List<ParsedIntentInfo> intents = activity.getIntents();
for (int indexIntent = 0; indexIntent < intents.size(); indexIntent++) {
final IntentFilter intentFilter = intents.get(indexIntent).getIntentFilter();
if (intentFilter != null && intentFilter.matchCategories(categories) == null) {