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

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

Merge "[pm] make archiveTimeMillis as part of ArchiveState" into main

parents 021fc462 db032450

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

+3 −1
Original line number Diff line number Diff line
@@ -1532,7 +1532,9 @@ public class ComputerEngine implements Computer { 
                    ai, flags, state, userId);

            pi.signingInfo = ps.getSigningInfo();

            pi.signatures = getDeprecatedSignatures(pi.signingInfo.getSigningDetails(), flags);

            pi.setArchiveTimeMillis(state.getArchiveTimeMillis());

            if (state.getArchiveState() != null) {

                pi.setArchiveTimeMillis(state.getArchiveState().getArchiveTimeMillis());

            }



            if (DEBUG_PACKAGE_INFO) {

                Log.v(TAG, "ps.pkg is n/a for ["

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

+0 −5
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS; 
import static android.content.pm.Flags.sdkLibIndependence;

import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;

import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;

import static android.content.pm.PackageManager.DELETE_ARCHIVE;

import static android.content.pm.PackageManager.DELETE_KEEP_DATA;

import static android.content.pm.PackageManager.DELETE_SUCCEEDED;

import static android.content.pm.PackageManager.MATCH_KNOWN_PACKAGES;
@@ -613,10 +612,6 @@ final class DeletePackageHelper { 
                    firstInstallTime,

                    PackageManager.USER_MIN_ASPECT_RATIO_UNSET,

                    archiveState);



            if ((flags & DELETE_ARCHIVE) != 0) {

                ps.modifyUserState(nextUserId).setArchiveTimeMillis(System.currentTimeMillis());

            }

        }

        mPm.mSettings.writeKernelMappingLPr(ps);

    }

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

+0 −3
Original line number Diff line number Diff line
@@ -691,7 +691,6 @@ final class InstallPackageHelper { 
                    pkgSetting.setUninstallReason(PackageManager.UNINSTALL_REASON_UNKNOWN, userId);

                    pkgSetting.setFirstInstallTime(System.currentTimeMillis(), userId);

                    // Clear any existing archive state.

                    pkgSetting.setArchiveTimeMillis(0, userId);

                    pkgSetting.setArchiveState(null, userId);

                    mPm.mSettings.writePackageRestrictionsLPr(userId);

                    mPm.mSettings.writeKernelMappingLPr(pkgSetting);
@@ -2272,7 +2271,6 @@ final class InstallPackageHelper { 
                    }

                    // Clear any existing archive state.

                    ps.setArchiveState(null, userId);

                    ps.setArchiveTimeMillis(0, userId);

                } else if (allUsers != null) {

                    // The caller explicitly specified INSTALL_ALL_USERS flag.

                    // Thus, updating the settings to install the app for all users.
@@ -2297,7 +2295,6 @@ final class InstallPackageHelper { 
                            }

                            // Clear any existing archive state.

                            ps.setArchiveState(null, currentUserId);

                            ps.setArchiveTimeMillis(0, currentUserId);

                        } else {

                            ps.setInstalled(false, currentUserId);

                        }

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

+0 −5
Original line number Diff line number Diff line
@@ -775,11 +775,6 @@ public class PackageSetting extends SettingBase implements PackageStateInternal 
        onChanged();

    }



    void setArchiveTimeMillis(long value, int userId) {

        modifyUserState(userId).setArchiveTimeMillis(value);

        onChanged();

    }



    boolean getInstalled(int userId) {

        return readUserState(userId).isInstalled();

    }

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

+0 −3
Original line number Diff line number Diff line
@@ -419,9 +419,6 @@ final class RemovePackageHelper { 
                    Slog.d(TAG, "    user " + userId + ": " + wasInstalled + " => " + false);

                }

                deletedPs.setInstalled(/* installed= */ false, userId);

                if (isArchive) {

                    deletedPs.modifyUserState(userId).setArchiveTimeMillis(currentTimeMillis);

                }

            }

        }

        // make sure to preserve per-user installed state if this removal was just