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

Commit a7d9b937 authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "Refuse update of a system app if it changes its shared uid"

parents 1970f570 c935d1f1

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

+13 −2
Original line number Diff line number Diff line
@@ -9214,10 +9214,21 @@ public class PackageManagerService extends IPackageManager.Stub { 
                final PackageSetting newPkgSetting = (PackageSetting)newPackage.mExtras;

                newPkgSetting.firstInstallTime = oldPkgSetting.firstInstallTime;

                newPkgSetting.lastUpdateTime = System.currentTimeMillis();













                // is the update attempting to change shared user? that isn't going to work...













                if (oldPkgSetting.sharedUser != newPkgSetting.sharedUser) {













                    Slog.w(TAG, "Forbidding shared user change from " + oldPkgSetting.sharedUser













                            + " to " + newPkgSetting.sharedUser);













                    res.returnCode = PackageManager.INSTALL_FAILED_SHARED_USER_INCOMPATIBLE;













                    updatedSettings = true;













                }















            }

























            if (res.returnCode == PackageManager.INSTALL_SUCCEEDED) {















                updateSettingsLI(newPackage, installerPackageName, allUsers, perUserInstalled, res);















                updatedSettings = true;















            }













        }





























        if (res.returnCode != PackageManager.INSTALL_SUCCEEDED) {















            // Re installation failed. Restore old information