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

Commit 1565ff2f 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"... 

Merge "Pause watchdog triggering on the main thread during OtaDexoptService" into qt-dev am: fb9843f8 am: 9b056272
am: 99f687fd

Change-Id: I7ecf91262c8600afb7a3f6b3ff45fc11ecd90e3a
parents 7d00f9dd 99f687fd

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

+2 −0
Original line number Diff line number Diff line
@@ -751,10 +751,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();

                }

            }