Merge "Merge \"Don\'t force fstrim on OTA\" into nyc-mr1-dev am: bef41bf538"... (826a6354) · Commits · e / os / android_frameworks_base

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 {