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

Commit d945e6b4 authored Apr 02, 2015 by Svetoslav Committed by Android (Google) Code Review Apr 02, 2015

Merge "Do not clear a shared user's permissions on an app install."

parents 2a53812c d2cf3aec

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

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -7397,9 +7397,11 @@ public class PackageManagerService extends IPackageManager.Stub {

	if (replace) {		if (replace) {
	ps.installPermissionsFixed = false;		ps.installPermissionsFixed = false;
			if (!ps.isSharedUser()) {
	origPermissions = new PermissionsState(permissionsState);		origPermissions = new PermissionsState(permissionsState);
	permissionsState.reset();		permissionsState.reset();
	}		}
			}

	permissionsState.setGlobalGids(mGlobalGids);		permissionsState.setGlobalGids(mGlobalGids);

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -74,4 +74,8 @@ final class PackageSetting extends PackageSettingBase {
	public boolean isSystem() {		public boolean isSystem() {
	return (pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0;		return (pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0;
	}		}

			public boolean isSharedUser() {
			return sharedUser != null;
			}
	}		}