diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index 339a9517703ec..c595b97f5987e 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -857,7 +857,7 @@ final class InstallPackageHelper { mPm.notifyInstallObserver(request.mInstallResult, request.mArgs.mObserver); } - @GuardedBy("mInstallLock") + @GuardedBy("mPm.mInstallLock") private void installPackagesTracedLI(List requests) { try { Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "installPackages"); @@ -886,7 +886,7 @@ final class InstallPackageHelper { * * Failure at any phase will result in a full failure to install all packages. */ - @GuardedBy("mInstallLock") + @GuardedBy("mPm.mInstallLock") private void installPackagesLI(List requests) { final Map preparedScans = new ArrayMap<>(requests.size()); final Map installArgs = new ArrayMap<>(requests.size()); @@ -1038,7 +1038,7 @@ final class InstallPackageHelper { } } - @GuardedBy("mInstallLock") + @GuardedBy("mPm.mInstallLock") private PrepareResult preparePackageLI(InstallArgs args, PackageInstalledInfo res) throws PrepareFailure { final int installFlags = args.mInstallFlags; @@ -1882,7 +1882,7 @@ final class InstallPackageHelper { } } - @GuardedBy("mLock") + @GuardedBy("mPm.mLock") private void commitPackagesLocked(final CommitRequest request) { // TODO: remove any expected failures from this method; this should only be able to fail due // to unavoidable errors (I/O, etc.) @@ -1999,7 +1999,7 @@ final class InstallPackageHelper { ApplicationPackageManager.invalidateGetPackagesForUidCache(); } - @GuardedBy("mLock") + @GuardedBy("mPm.mLock") private boolean disableSystemPackageLPw(AndroidPackage oldPkg) { return mPm.mSettings.disableSystemPackageLPw(oldPkg.getPackageName(), true); }