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

Commit a9ab8516 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 6eca92dd ab2fc348

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

+7 −2
Original line number Original line Diff line number Diff line
@@ -731,8 +731,13 @@ public final class SystemServer { 
                    (int) SystemClock.elapsedRealtime());

                    (int) SystemClock.elapsedRealtime());

        }

        }

        traceBeginAndSlog("StartPackageManagerService");

        traceBeginAndSlog("StartPackageManagerService");

        try {

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

            mPackageManagerService = PackageManagerService.main(mSystemContext, installer,

            mPackageManagerService = PackageManagerService.main(mSystemContext, installer,

                    mFactoryTestMode != FactoryTest.FACTORY_TEST_OFF, mOnlyCore);

                    mFactoryTestMode != FactoryTest.FACTORY_TEST_OFF, mOnlyCore);

        } finally {

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

        }

        mFirstBoot = mPackageManagerService.isFirstBoot();

        mFirstBoot = mPackageManagerService.isFirstBoot();

        mPackageManager = mSystemContext.getPackageManager();

        mPackageManager = mSystemContext.getPackageManager();

        traceEnd();

        traceEnd();