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

Commit 392a8034 authored by Shafik Nassar's avatar Shafik Nassar Committed by android-build-merger
Browse files

Merge "Monitor RollbackManagerServiceImpl#mHandlerThread" into qt-dev

am: 906e4169

Change-Id: Ic12e92c655c7cdb5ece0f7bac1ced3796309e540
parents d4e13075 906e4169
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.LocalServices;
import com.android.server.Watchdog;
import com.android.server.pm.Installer;

import java.io.File;
@@ -99,6 +100,9 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
    // handler threads are running so that's fine.
    private long mRollbackLifetimeDurationInMillis = DEFAULT_ROLLBACK_LIFETIME_DURATION_MILLIS;

    private static final long HANDLER_THREAD_TIMEOUT_DURATION_MILLIS =
            TimeUnit.MINUTES.toMillis(10);

    // Used for generating rollback IDs.
    private final Random mRandom = new SecureRandom();

@@ -138,6 +142,9 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {
        mHandlerThread = new HandlerThread("RollbackManagerServiceHandler");
        mHandlerThread.start();

        // Monitor the handler thread
        Watchdog.getInstance().addThread(getHandler(), HANDLER_THREAD_TIMEOUT_DURATION_MILLIS);

        mRollbackStore = new RollbackStore(new File(Environment.getDataDirectory(), "rollback"));

        mPackageHealthObserver = new RollbackPackageHealthObserver(mContext);