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

Commit 5bb8bc47 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am bfe28603: am 31d0207a: Merge "Clear pending operation flag when move failed." into lmp-dev 

* commit 'bfe28603b7ac6a5faf071fe30bbd1c9272fc69e3':
  Clear pending operation flag when move failed.
parents 1c9a6a96 da84da1e

services/core/java/com/android/server/pm/PackageManagerService.java

+11 −0
Original line number Diff line number Diff line
@@ -12914,6 +12914,17 @@ public class PackageManagerService extends IPackageManager.Stub { 
                    Bundle extras) throws RemoteException {

                Slog.d(TAG, "Install result for move: "

                        + PackageManager.installStatusToString(returnCode, msg));













                // We usually have a new package now after the install, but if













                // we failed we need to clear the pending flag on the original













                // package object.













                synchronized (mPackages) {













                    final PackageParser.Package pkg = mPackages.get(packageName);













                    if (pkg != null) {













                        pkg.mOperationPending = false;













                    }













                }



























                final int status = PackageManager.installStatusToPublicStatus(returnCode);















                switch (status) {















                    case PackageInstaller.STATUS_SUCCESS: