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

Commit 5dc10505 authored by Zimuzo's avatar Zimuzo Committed by android-build-merger
Browse files

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

am: a9ab8516

Change-Id: I742efbdc2ac20ab2373089975505bac66f273b81
parents bfd67e9f a9ab8516
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -731,8 +731,13 @@ public final class SystemServer {
                    (int) SystemClock.elapsedRealtime());
        }
        traceBeginAndSlog("StartPackageManagerService");
        try {
            Watchdog.getInstance().pauseWatchingCurrentThread("packagemanagermain");
            mPackageManagerService = PackageManagerService.main(mSystemContext, installer,
                    mFactoryTestMode != FactoryTest.FACTORY_TEST_OFF, mOnlyCore);
        } finally {
            Watchdog.getInstance().resumeWatchingCurrentThread("packagemanagermain");
        }
        mFirstBoot = mPackageManagerService.isFirstBoot();
        mPackageManager = mSystemContext.getPackageManager();
        traceEnd();