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

2019-05-31 16:14:17 +00:00
parent 5b9e00273b f3c4614d1f
commit fb9843f8d7
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();
                }
            }