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

Commit 5a9291a4 authored by Aleksandr Lukin's avatar Aleksandr Lukin Committed by Automerger Merge Worker
Browse files

Merge "Move SmartStorageMaintIdler execution to a separate thread" into udc-qpr-dev am: 5b93cf9e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24758889



Change-Id: I279a3e360784f781af8c298f05542ffe2ec4f4dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4eef1be5 5b93cf9e

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

+19 −10
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Context; 
import android.util.Slog;



import java.util.concurrent.TimeUnit;

import java.util.concurrent.atomic.AtomicBoolean;



public class SmartStorageMaintIdler extends JobService {

    private static final String TAG = "SmartStorageMaintIdler";
@@ -34,15 +35,15 @@ public class SmartStorageMaintIdler extends JobService { 


    private static final int SMART_MAINT_JOB_ID = 2808;



    private boolean mStarted;

    private final AtomicBoolean mStarted = new AtomicBoolean(false);

    private JobParameters mJobParams;

    private final Runnable mFinishCallback = new Runnable() {

        @Override

        public void run() {

            Slog.i(TAG, "Got smart storage maintenance service completion callback");

            if (mStarted) {

            if (mStarted.get()) {

                jobFinished(mJobParams, false);

                mStarted = false;

                mStarted.set(false);

            }

            // ... and try again in a next period

            scheduleSmartIdlePass(SmartStorageMaintIdler.this,
@@ -52,18 +53,26 @@ public class SmartStorageMaintIdler extends JobService { 


    @Override

    public boolean onStartJob(JobParameters params) {

        final StorageManagerService ms = StorageManagerService.sSelf;

        if (mStarted.compareAndSet(false, true)) {

            new Thread() {

                public void run() {

                    mJobParams = params;

        StorageManagerService ms = StorageManagerService.sSelf;

                    if (ms != null) {

            mStarted = true;

                        ms.runSmartIdleMaint(mFinishCallback);

                    } else {

                        mStarted.set(false);

                    }

                }

            }.start();

            return ms != null;

        }

        return false;

    }



    @Override

    public boolean onStopJob(JobParameters params) {

        mStarted = false;

        mStarted.set(false);

        return false;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -2841,7 +2841,7 @@ class StorageManagerService extends IStorageManager.Stub 
        return true;

    }



    void runSmartIdleMaint(Runnable callback) {

    synchronized void runSmartIdleMaint(Runnable callback) {

        enforcePermission(android.Manifest.permission.MOUNT_FORMAT_FILESYSTEMS);



        try {