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

Commit 91f8c0ea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in BootReceiver" into main am: 82b439be 

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



Change-Id: I319ea6fe167b4f2a8f8e724b99513f048037ddb7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c719f45 82b439be

services/core/java/com/android/server/os/NativeTombstoneManager.java

+4 −1
Original line number Diff line number Diff line
@@ -96,12 +96,15 @@ public final class NativeTombstoneManager { 
        mHandler = thread.getThreadHandler();



        mWatcher = new TombstoneWatcher();

        mWatcher.startWatching();

    }



    void onSystemReady() {

        registerForUserRemoval();

        registerForPackageRemoval();

        // TombstoneWatcher depends on DropboxManagerService.

        // DropboxManagerService started before systemReady.

        // So it is good to call startWatching here.

        mWatcher.startWatching();



        BootReceiver.initDropboxRateLimiter();