Fix issue #18607384: Run fstrim after every system update
Change-Id: I06f4c0b9e6834a8c8bd85710dfd9fa16471b6ad2
This commit is contained in:
@@ -4539,26 +4539,35 @@ public class PackageManagerService extends IPackageManager.Stub {
|
||||
try {
|
||||
IMountService ms = PackageHelper.getMountService();
|
||||
if (ms != null) {
|
||||
final long interval = android.provider.Settings.Global.getLong(
|
||||
mContext.getContentResolver(),
|
||||
android.provider.Settings.Global.FSTRIM_MANDATORY_INTERVAL,
|
||||
DEFAULT_MANDATORY_FSTRIM_INTERVAL);
|
||||
if (interval > 0) {
|
||||
final long timeSinceLast = System.currentTimeMillis() - ms.lastMaintenance();
|
||||
if (timeSinceLast > interval) {
|
||||
Slog.w(TAG, "No disk maintenance in " + timeSinceLast
|
||||
+ "; running immediately");
|
||||
if (!isFirstBoot()) {
|
||||
try {
|
||||
ActivityManagerNative.getDefault().showBootMessage(
|
||||
mContext.getResources().getString(
|
||||
R.string.android_upgrading_fstrim), true);
|
||||
} catch (RemoteException e) {
|
||||
}
|
||||
final boolean isUpgrade = isUpgrade();
|
||||
boolean doTrim = isUpgrade;
|
||||
if (doTrim) {
|
||||
Slog.w(TAG, "Running disk maintenance immediately due to system update");
|
||||
} else {
|
||||
final long interval = android.provider.Settings.Global.getLong(
|
||||
mContext.getContentResolver(),
|
||||
android.provider.Settings.Global.FSTRIM_MANDATORY_INTERVAL,
|
||||
DEFAULT_MANDATORY_FSTRIM_INTERVAL);
|
||||
if (interval > 0) {
|
||||
final long timeSinceLast = System.currentTimeMillis() - ms.lastMaintenance();
|
||||
if (timeSinceLast > interval) {
|
||||
doTrim = true;
|
||||
Slog.w(TAG, "No disk maintenance in " + timeSinceLast
|
||||
+ "; running immediately");
|
||||
}
|
||||
ms.runMaintenance();
|
||||
}
|
||||
}
|
||||
if (doTrim) {
|
||||
if (!isFirstBoot()) {
|
||||
try {
|
||||
ActivityManagerNative.getDefault().showBootMessage(
|
||||
mContext.getResources().getString(
|
||||
R.string.android_upgrading_fstrim), true);
|
||||
} catch (RemoteException e) {
|
||||
}
|
||||
}
|
||||
ms.runMaintenance();
|
||||
}
|
||||
} else {
|
||||
Slog.e(TAG, "Mount service unavailable!");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user