Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 780d56da authored by Alex Buynytskyy's avatar Alex Buynytskyy
Browse files

Fix for: Intent.FLAG_EXCLUDE_STOPPED_PACKAGES has no effect

Bug: 245687384
Bug: 245383343
Fixes: 245687384
Fixes: 245383343
Test: atest PackageManagerTest
Change-Id: Ic01586d25cc2b6e5a4c000917658cb043bc4d786
parent d16b0c13
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -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");
                }
+3 −1
Original line number Diff line number Diff line
@@ -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;
            }