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

Commit a85b9919 authored by Jin Qian's avatar Jin Qian
Browse files

Add entry points to invoke idle maintenance from vold 

Test: adb shell sm idle-maint [run|abort]
Bug: 67776637
Change-Id: Ibc686a318f6f79a4f8303f56451bc1d573d829e8
parent 8c07286d

core/java/android/os/storage/IStorageManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -186,4 +186,6 @@ interface IStorageManager { 
    long getAllocatableBytes(String volumeUuid, int flags, String callingPackage) = 77;

    void allocateBytes(String volumeUuid, long bytes, int flags, String callingPackage) = 78;

    void secdiscard(in String path) = 79;

    void runIdleMaintenance() = 80;

    void abortIdleMaintenance() = 81;

}

services/core/java/com/android/server/StorageManagerService.java

+65 −0
Original line number Diff line number Diff line
@@ -542,6 +542,8 @@ class StorageManagerService extends IStorageManager.Stub implements Watchdog.Mon 
    private static final int H_VOLUME_UNMOUNT = 8;

    private static final int H_PARTITION_FORGET = 9;

    private static final int H_RESET = 10;

    private static final int H_RUN_IDLE_MAINT = 11;

    private static final int H_ABORT_IDLE_MAINT = 12;



    class StorageManagerServiceHandler extends Handler {

        public StorageManagerServiceHandler(Looper looper) {
@@ -650,6 +652,17 @@ class StorageManagerService extends IStorageManager.Stub implements Watchdog.Mon 
                    resetIfReadyAndConnected();

                    break;

                }

                case H_RUN_IDLE_MAINT: {

                    Slog.i(TAG, "Running idle maintenance");

                    runIdleMaint((Runnable)msg.obj);

                    break;

                }

                case H_ABORT_IDLE_MAINT: {

                    Slog.i(TAG, "Aborting idle maintenance");

                    abortIdleMaint((Runnable)msg.obj);

                    break;

                }



            }

        }

    }
@@ -1779,6 +1792,58 @@ class StorageManagerService extends IStorageManager.Stub implements Watchdog.Mon 
        }

    }



    void runIdleMaint(Runnable callback) {

        enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS);



        try {

            mVold.runIdleMaint(new IVoldTaskListener.Stub() {

                @Override

                public void onStatus(int status, PersistableBundle extras) {

                    // Not currently used

                }

                @Override

                public void onFinished(int status, PersistableBundle extras) {

                    if (callback != null) {

                        BackgroundThread.getHandler().post(callback);

                    }

                }

            });

        } catch (Exception e) {

            Slog.wtf(TAG, e);

        }

    }



    @Override

    public void runIdleMaintenance() {

        runIdleMaint(null);

    }



    void abortIdleMaint(Runnable callback) {

        enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS);



        try {

            mVold.abortIdleMaint(new IVoldTaskListener.Stub() {

                @Override

                public void onStatus(int status, PersistableBundle extras) {

                    // Not currently used

                }

                @Override

                public void onFinished(int status, PersistableBundle extras) {

                    if (callback != null) {

                        BackgroundThread.getHandler().post(callback);

                    }

                }

            });

        } catch (Exception e) {

            Slog.wtf(TAG, e);

        }

    }



    @Override

    public void abortIdleMaintenance() {

        abortIdleMaint(null);

    }



    private void remountUidExternalStorage(int uid, int mode) {

        try {

            mVold.remountUid(uid, mode);