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

Commit d1e5afd5 authored by Song Chun Fan's avatar Song Chun Fan Committed by Android (Google) Code Review
Browse files

Merge "[pm] feature flag to turn on new MATCH_UNINSTALLED_PACKAGES behavior" into main

parents 809f0523 7079f24d

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

+1 −1
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ public class PackageSetting extends SettingBase implements PackageStateInternal 
            if (userState.isInstalled()) {

                return true;

            }

            if (userState.getCeDataInode() > 0) {

            if (userState.dataExists()) {

                return true;

            }

        }

services/core/java/com/android/server/pm/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -6,3 +6,11 @@ flag { 
    description: "Feature flag for Quarantined state"

    bug: "269127435"

}



flag {

    name: "new_match_uninstalled_enabled"

    namespace: "package_manager_service"

    description: "Feature flag for new MATCH_UNINSTALLED_PACKAGES behavior"

    bug: "298681254"

    is_fixed_read_only: true

}

services/core/java/com/android/server/pm/pkg/PackageUserState.java

+7 −0
Original line number Diff line number Diff line
@@ -242,4 +242,11 @@ public interface PackageUserState { 
    @Nullable

    ArchiveState getArchiveState();



    /**

     * @return whether the data dir exists. True when the app is installed for the user, or when the

     * app is uninstalled for the user with {@link PackageManager#DELETE_KEEP_DATA}.

     *

     * @hide

     */

    boolean dataExists();

}

services/core/java/com/android/server/pm/pkg/PackageUserStateDefault.java

+5 −0
Original line number Diff line number Diff line
@@ -196,4 +196,9 @@ class PackageUserStateDefault implements PackageUserStateInternal { 
    public ArchiveState getArchiveState() {

        return null;

    }



    @Override

    public boolean dataExists() {

        return true;

    }

}

services/core/java/com/android/server/pm/pkg/PackageUserStateImpl.java

+4 −0
Original line number Diff line number Diff line
@@ -685,6 +685,10 @@ public class PackageUserStateImpl extends WatchableImpl implements PackageUserSt 
        return false;

    }



    @Override

    public boolean dataExists() {

        return getCeDataInode() > 0;

    }