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

Commit 3bfd04ff authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 51ff575d: Merge "Fix issue #7649720: ANR occur when OTA with lower version..." 

# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '51ff575d':
  Fix issue #7649720: ANR occur when OTA with lower version...
parents 58b33c3d 51ff575d

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

+7 −0
Original line number Diff line number Diff line
@@ -3297,6 +3297,13 @@ public class PackageManagerService extends IPackageManager.Stub { 
                    Log.i(TAG, "Package " + ps.name + " at " + scanFile

                            + " ignored: updated version " + ps.versionCode

                            + " better than this " + pkg.mVersionCode);

                    if (!updatedPkg.codePath.equals(scanFile)) {

                        Slog.w(PackageManagerService.TAG, "Code path for hidden system pkg : "

                                + ps.name + " changing from " + updatedPkg.codePathString

                                + " to " + scanFile);

                        updatedPkg.codePath = scanFile;

                        updatedPkg.codePathString = scanFile.toString();                        

                    }

                    mLastScanError = PackageManager.INSTALL_FAILED_DUPLICATE_PACKAGE;

                    return null;

                } else {