Merge "Don't remove permission when cleaning up orphaned tree on uninstall" into tm-qpr-dev (f0f951f7) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java

+0 −21

Original line number	Diff line number	Diff line
		@@ -4215,7 +4215,6 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
		}
		boolean changed = false;

		Set<Permission> needsUpdate = null;
		synchronized (mLock) {
		final Iterator<Permission> it = mRegistry.getPermissionTrees().iterator();
		while (it.hasNext()) {
		@@ -4234,26 +4233,6 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
		+ " that used to be declared by " + bp.getPackageName());
		it.remove();
		}
		if (needsUpdate == null) {
		needsUpdate = new ArraySet<>();
		}
		needsUpdate.add(bp);
		}
		}
		if (needsUpdate != null) {
		for (final Permission bp : needsUpdate) {
		final AndroidPackage sourcePkg =
		mPackageManagerInt.getPackage(bp.getPackageName());
		final PackageStateInternal sourcePs =
		mPackageManagerInt.getPackageStateInternal(bp.getPackageName());
		synchronized (mLock) {
		if (sourcePkg != null && sourcePs != null) {
		continue;
		}
		Slog.w(TAG, "Removing dangling permission tree: " + bp.getName()
		+ " from package " + bp.getPackageName());
		mRegistry.removePermission(bp.getName());
		}
		}
		}
		return changed;