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

am: fb9843f8d7 Change-Id: I362fe849a75ebeedc40257745b7e4069f12324bd
2019-05-31 09:29:47 -07:00
parent 9b87b9a6dd fb9843f8d7
commit 9b05627270
1 changed files with 2 additions and 0 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -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();
                }
            }