Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't remove permission when cleaning up orphaned tree on uninstall" into tm-qpr-dev

Browse Source
This commit is contained in:
Joe Castro
2023-01-12 01:06:17 +00:00
committed by Android (Google) Code Review
parent 6d0057ce3c 02b90551b9
commit f0f951f7a8
1 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
View File

@@ -4215,7 +4215,6 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
} }
boolean changed = false; boolean changed = false;
Set<Permission> needsUpdate = null;
synchronized (mLock) { synchronized (mLock) {
final Iterator<Permission> it = mRegistry.getPermissionTrees().iterator(); final Iterator<Permission> it = mRegistry.getPermissionTrees().iterator();
while (it.hasNext()) { while (it.hasNext()) {
@@ -4234,26 +4233,6 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+ " that used to be declared by " + bp.getPackageName()); + " that used to be declared by " + bp.getPackageName());
it.remove(); 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; return changed;