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

Commit b020ad15 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Merge "Cleanup removed package's data immediately." into main

parents 62d248d9 6d5ec860

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -3349,9 +3349,7 @@ final class InstallPackageHelper { 
            if (disabledPs == null) {

            if (disabledPs == null) {

                logCriticalInfo(Log.WARN, "System package " + packageName

                logCriticalInfo(Log.WARN, "System package " + packageName

                        + " no longer exists; its data will be wiped");

                        + " no longer exists; its data will be wiped");

                mInjector.getHandler().post(

                mRemovePackageHelper.removePackageData(ps, userIds);

                        () -> mRemovePackageHelper.removePackageData(ps, userIds));

                expectingBetter.put(ps.getPackageName(), ps.getPath());

            } else {

            } else {

                // we still have a disabled system package, but, it still might have

                // we still have a disabled system package, but, it still might have

                // been removed. check the code path still exists and check there's

                // been removed. check the code path still exists and check there's

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

+7 −5
Original line number Original line Diff line number Diff line
@@ -395,11 +395,13 @@ final class RemovePackageHelper { 
                mPm.mSettings.removeRenamedPackageLPw(deletedPs.getRealName());

                mPm.mSettings.removeRenamedPackageLPw(deletedPs.getRealName());

            }

            }

            if (changedUsers.size() > 0) {

            if (changedUsers.size() > 0) {

                mPm.mInjector.getBackgroundHandler().post(() -> {

                    final PreferredActivityHelper preferredActivityHelper =

                    final PreferredActivityHelper preferredActivityHelper =

                            new PreferredActivityHelper(mPm, mBroadcastHelper);

                            new PreferredActivityHelper(mPm, mBroadcastHelper);

                    preferredActivityHelper.updateDefaultHomeNotLocked(mPm.snapshotComputer(),

                    preferredActivityHelper.updateDefaultHomeNotLocked(mPm.snapshotComputer(),

                            changedUsers);

                            changedUsers);

                    mBroadcastHelper.sendPreferredActivityChangedBroadcast(UserHandle.USER_ALL);

                    mBroadcastHelper.sendPreferredActivityChangedBroadcast(UserHandle.USER_ALL);

                });

            }

            }

        } else if (!deletedPs.isSystem() && outInfo != null && !outInfo.mIsUpdate

        } else if (!deletedPs.isSystem() && outInfo != null && !outInfo.mIsUpdate

                && outInfo.mRemovedUsers != null && !outInfo.mIsExternal) {

                && outInfo.mRemovedUsers != null && !outInfo.mIsExternal) {