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

Fix for: Intent.FLAG_EXCLUDE_STOPPED_PACKAGES has no effect

Browse Source 
Bug: 245687384
Bug: 245383343
Fixes: 245687384
Fixes: 245383343
Test: atest PackageManagerTest
Change-Id: Ic01586d25cc2b6e5a4c000917658cb043bc4d786
This commit is contained in:
Alex Buynytskyy
2022-09-09 14:25:23 -07:00
parent d16b0c13b3
commit 780d56dae4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/IntentResolver.java
View File

@@ -35,7 +35,6 @@ import android.util.proto.ProtoOutputStream;
import com.android.internal.util.FastPrintWriter;
import com.android.server.pm.Computer;
import com.android.server.pm.pkg.PackageStateInternal;
import com.android.server.pm.snapshot.PackageDataSnapshot;
import java.io.PrintWriter;
@@ -566,7 +565,7 @@ public abstract class IntentResolver<F, R extends Object> {
* "stopped", that is whether it should not be included in the result
* if the intent requests to excluded stopped objects.
*/
protected boolean isFilterStopped(PackageStateInternal packageState, @UserIdInt int userId) {
protected boolean isFilterStopped(@NonNull Computer computer, F filter, @UserIdInt int userId) {
return false;
}
@@ -805,8 +804,7 @@ public abstract class IntentResolver<F, R extends Object> {
int match;
if (debug) Slog.v(TAG, "Matching against filter " + filter);
if (excludingStopped && isFilterStopped(computer.getPackageStateInternal(packageName),
userId)) {
if (excludingStopped && isFilterStopped(computer, filter, userId)) {
if (debug) {
Slog.v(TAG, " Filter's target is stopped; skipping");
}

4
services/core/java/com/android/server/pm/resolution/ComponentResolver.java
View File

@@ -930,12 +930,14 @@ public class ComponentResolver extends ComponentResolverLocked implements
}
@Override
protected boolean isFilterStopped(@Nullable PackageStateInternal packageState,
protected boolean isFilterStopped(@NonNull Computer computer, F filter,
@UserIdInt int userId) {
if (!mUserManager.exists(userId)) {
return true;
}
final PackageStateInternal packageState = computer.getPackageStateInternal(
filter.first.getPackageName());
if (packageState == null || packageState.getPkg() == null) {
return false;
}