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

Commit 9b056272 authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by android-build-merger
Browse files

Merge "Pause watchdog triggering on the main thread during OtaDexoptService" into qt-dev 

am: fb9843f8

Change-Id: I362fe849a75ebeedc40257745b7e4069f12324bd
parents 9b87b9a6 fb9843f8

services/java/com/android/server/SystemServer.java

+2 −0
Original line number Diff line number Diff line
@@ -749,10 +749,12 @@ public final class SystemServer { 
            if (!disableOtaDexopt) {

                traceBeginAndSlog("StartOtaDexOptService");

                try {

                    Watchdog.getInstance().pauseWatchingCurrentThread("moveab");

                    OtaDexoptService.main(mSystemContext, mPackageManagerService);

                } catch (Throwable e) {

                    reportWtf("starting OtaDexOptService", e);

                } finally {

                    Watchdog.getInstance().resumeWatchingCurrentThread("moveab");

                    traceEnd();

                }

            }