diff --git a/core/java/android/os/storage/IMountService.java b/core/java/android/os/storage/IMountService.java index cf407f401844a..116110eba74d1 100644 --- a/core/java/android/os/storage/IMountService.java +++ b/core/java/android/os/storage/IMountService.java @@ -856,6 +856,38 @@ public interface IMountService extends IInterface { } return _result; } + + @Override + public long lastMaintenance() throws RemoteException { + Parcel _data = Parcel.obtain(); + Parcel _reply = Parcel.obtain(); + long _result; + try { + _data.writeInterfaceToken(DESCRIPTOR); + mRemote.transact(Stub.TRANSACTION_lastMaintenance, _data, _reply, 0); + _reply.readException(); + _result = _reply.readLong(); + } finally { + _reply.recycle(); + _data.recycle(); + } + return _result; + } + + @Override + public void runMaintenance() throws RemoteException { + Parcel _data = Parcel.obtain(); + Parcel _reply = Parcel.obtain(); + try { + _data.writeInterfaceToken(DESCRIPTOR); + mRemote.transact(Stub.TRANSACTION_runMaintenance, _data, _reply, 0); + _reply.readException(); + } finally { + _reply.recycle(); + _data.recycle(); + } + return; + } } private static final String DESCRIPTOR = "IMountService"; @@ -942,6 +974,10 @@ public interface IMountService extends IInterface { static final int TRANSACTION_resizeSecureContainer = IBinder.FIRST_CALL_TRANSACTION + 40; + static final int TRANSACTION_lastMaintenance = IBinder.FIRST_CALL_TRANSACTION + 41; + + static final int TRANSACTION_runMaintenance = IBinder.FIRST_CALL_TRANSACTION + 42; + /** * Cast an IBinder object into an IMountService interface, generating a * proxy if needed. @@ -1347,6 +1383,19 @@ public interface IMountService extends IInterface { reply.writeInt(resultCode); return true; } + case TRANSACTION_lastMaintenance: { + data.enforceInterface(DESCRIPTOR); + long lastMaintenance = lastMaintenance(); + reply.writeNoException(); + reply.writeLong(lastMaintenance); + return true; + } + case TRANSACTION_runMaintenance: { + data.enforceInterface(DESCRIPTOR); + runMaintenance(); + reply.writeNoException(); + return true; + } } return super.onTransact(code, data, reply, flags); } @@ -1617,4 +1666,18 @@ public interface IMountService extends IInterface { public String getField(String field) throws RemoteException; public int resizeSecureContainer(String id, int sizeMb, String key) throws RemoteException; + + /** + * Report the time of the last maintenance operation such as fstrim. + * @return Timestamp of the last maintenance operation, in the + * System.currentTimeMillis() time base + * @throws RemoteException + */ + public long lastMaintenance() throws RemoteException; + + /** + * Kick off an immediate maintenance operation + * @throws RemoteException + */ + public void runMaintenance() throws RemoteException; } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 3c12e06953136..5e5fbc79a0d8d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5549,6 +5549,13 @@ public final class Settings { */ public static final String PACKAGE_VERIFIER_INCLUDE_ADB = "verifier_verify_adb_installs"; + /** + * Time since last fstrim (milliseconds) after which we force one to happen + * during device startup. If unset, the default is 3 days. + * @hide + */ + public static final String FSTRIM_MANDATORY_INTERVAL = "fstrim_mandatory_interval"; + /** * The interval in milliseconds at which to check packet counts on the * mobile data interface when screen is on, to detect possible data diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 9f69d09936467..910b031aefb8b 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3733,6 +3733,9 @@ Android is starting\u2026 + + Optimizing storage. + Optimizing app %1$d of diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 18803517de9fb..52969669d56b8 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1675,6 +1675,7 @@ + diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index e400fb67c0c7c..6c981c00504f9 100644 --- a/services/core/java/com/android/server/MountService.java +++ b/services/core/java/com/android/server/MountService.java @@ -83,6 +83,7 @@ import org.xmlpull.v1.XmlPullParserException; import java.io.File; import java.io.FileDescriptor; +import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; import java.math.BigInteger; @@ -90,7 +91,9 @@ import java.nio.charset.StandardCharsets; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; import java.security.spec.KeySpec; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -359,6 +362,11 @@ class MountService extends IMountService.Stub // Used in the ObbActionHandler private IMediaContainerService mContainerService = null; + // Last fstrim operation tracking + private static final String LAST_FSTRIM_FILE = "last-fstrim"; + private final File mLastMaintenanceFile; + private long mLastMaintenance; + // Handler messages private static final int H_UNMOUNT_PM_UPDATE = 1; private static final int H_UNMOUNT_PM_DONE = 2; @@ -536,6 +544,15 @@ class MountService extends IMountService.Stub case H_FSTRIM: { waitForReady(); Slog.i(TAG, "Running fstrim idle maintenance"); + + // Remember when we kicked it off + try { + mLastMaintenance = System.currentTimeMillis(); + mLastMaintenanceFile.setLastModified(mLastMaintenance); + } catch (Exception e) { + Slog.e(TAG, "Unable to record last fstrim!"); + } + try { // This method must be run on the main (handler) thread, // so it is safe to directly call into vold. @@ -544,6 +561,7 @@ class MountService extends IMountService.Stub } catch (NativeDaemonConnectorException ndce) { Slog.e(TAG, "Failed to run fstrim!"); } + // invoke the completion callback, if any Runnable callback = (Runnable) msg.obj; if (callback != null) { @@ -699,6 +717,18 @@ class MountService extends IMountService.Stub mHandler.sendMessage(mHandler.obtainMessage(H_FSTRIM, callback)); } + // Binder entry point for kicking off an immediate fstrim + @Override + public void runMaintenance() { + validatePermission(android.Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS); + runIdleMaintenance(null); + } + + @Override + public long lastMaintenance() { + return mLastMaintenance; + } + private void doShareUnshareVolume(String path, String method, boolean enable) { // TODO: Add support for multiple share methods if (!method.equals("ums")) { @@ -1477,6 +1507,22 @@ class MountService extends IMountService.Stub // Add OBB Action Handler to MountService thread. mObbActionHandler = new ObbActionHandler(IoThread.get().getLooper()); + // Initialize the last-fstrim tracking if necessary + File dataDir = Environment.getDataDirectory(); + File systemDir = new File(dataDir, "system"); + mLastMaintenanceFile = new File(systemDir, LAST_FSTRIM_FILE); + if (!mLastMaintenanceFile.exists()) { + // Not setting mLastMaintenance here means that we will force an + // fstrim during reboot following the OTA that installs this code. + try { + (new FileOutputStream(mLastMaintenanceFile)).close(); + } catch (IOException e) { + Slog.e(TAG, "Unable to create fstrim record " + mLastMaintenanceFile.getPath()); + } + } else { + mLastMaintenance = mLastMaintenanceFile.lastModified(); + } + /* * Create the connection to vold with a maximum queue of twice the * amount of containers we'd ever expect to have. This keeps an @@ -3075,6 +3121,12 @@ class MountService extends IMountService.Stub pw.increaseIndent(); mConnector.dump(fd, pw, args); pw.decreaseIndent(); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + pw.println(); + pw.print("Last maintenance: "); + pw.println(sdf.format(new Date(mLastMaintenance))); } /** {@inheritDoc} */ diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index ad720dc474c14..3e6d15afb15f8 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -141,6 +141,7 @@ import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.os.Environment.UserEnvironment; +import android.os.storage.IMountService; import android.os.storage.StorageManager; import android.os.Debug; import android.os.FileUtils; @@ -164,6 +165,7 @@ import android.system.ErrnoException; import android.system.Os; import android.system.StructStat; import android.text.TextUtils; +import android.text.format.DateUtils; import android.util.ArraySet; import android.util.AtomicFile; import android.util.DisplayMetrics; @@ -280,6 +282,18 @@ public class PackageManagerService extends IPackageManager.Stub { */ private static final long WATCHDOG_TIMEOUT = 1000*60*10; // ten minutes + /** + * Wall-clock timeout (in milliseconds) after which we *require* that an fstrim + * be run on this device. We use the value in the Settings.Global.MANDATORY_FSTRIM_INTERVAL + * settings entry if available, otherwise we use the hardcoded default. If it's been + * more than this long since the last fstrim, we force one during the boot sequence. + * + * This backstops other fstrim scheduling: if the device is alive at midnight+idle, + * one gets run at the next available charging+idle time. This final mandatory + * no-fstrim check kicks in only of the other scheduling criteria is never met. + */ + private static final long DEFAULT_MANDATORY_FSTRIM_INTERVAL = 3 * DateUtils.DAY_IN_MILLIS; + /** * Whether verification is enabled by default. */ @@ -4519,6 +4533,37 @@ public class PackageManagerService extends IPackageManager.Stub { public void performBootDexOpt() { enforceSystemOrRoot("Only the system can request dexopt be performed"); + // Before everything else, see whether we need to fstrim. + 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) { + } + } + ms.runMaintenance(); + } + } + } else { + Slog.e(TAG, "Mount service unavailable!"); + } + } catch (RemoteException e) { + // Can't happen; MountService is local + } + final ArraySet pkgs; synchronized (mPackages) { pkgs = mDeferredDexOpt;