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

Commit da70788a authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge \"Don\'t force fstrim on OTA\" into nyc-mr1-dev 

am: bef41bf5

Change-Id: I44a67399d64e44e4966e891f50d1c19db84f5a70
parents a4f09e73 bef41bf5

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

+11 −16
Original line number Diff line number Diff line
@@ -7268,11 +7268,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
        try {

            IMountService ms = PackageHelper.getMountService();

            if (ms != null) {

                final boolean isUpgrade = isUpgrade();

                boolean doTrim = isUpgrade;

                if (doTrim) {

                    Slog.w(TAG, "Running disk maintenance immediately due to system update");

                } else {

                boolean doTrim = false;

                final long interval = android.provider.Settings.Global.getLong(

                        mContext.getContentResolver(),

                        android.provider.Settings.Global.FSTRIM_MANDATORY_INTERVAL,
@@ -7285,7 +7281,6 @@ public class PackageManagerService extends IPackageManager.Stub { 
                                + "; running immediately");

                    }

                }

                }

                if (doTrim) {

                    if (!isFirstBoot()) {

                        try {