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

Commit b9da94da 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 

am: 4d8e3465

Change-Id: I9ba5ab7ac1282e15b3da00a738e2bfdcddf2ea07
parents afb0fa53 4d8e3465

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

+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();