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

Commit bef41bf5 authored by Chris Tate's avatar Chris Tate Committed by Android (Google) Code Review
Browse files

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

parents c7a25a3c d589c185

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 {