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

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

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

Merge \"Merge \\"Don\\'t force fstrim on OTA\\" into nyc-mr1-dev am: bef41bf5\" into nyc-mr1-dev-plus-aosp
am: 826a6354

Change-Id: Ifc1188d094221ed20d04aaa1212f5cd51ad8b202
parents 5359bd07 826a6354

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 {