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

Merge "Clear CDM associations onPackageDataCleared"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-29 05:13:40 +00:00
committed by Android (Google) Code Review
parent 6a13e152ed 58c458df25
commit 4a866e86b5
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -225,26 +225,28 @@ public class CompanionDeviceManagerService extends SystemService {
new PackageMonitor() {
@Override
public void onPackageRemoved(String packageName, int uid) {
Slog.d(LOG_TAG, "onPackageRemoved(packageName = " + packageName
+ ", uid = " + uid + ")");
int userId = getChangingUserId();
updateAssociations(
set -> filterOut(set, it -> it.belongsToPackage(userId, packageName)),
userId);
final int userId = getChangingUserId();
Slog.i(LOG_TAG, "onPackageRemoved() u" + userId + "/" + packageName);
mCompanionDevicePresenceController.unbindDevicePresenceListener(
packageName, userId);
clearAssociationForPackage(userId, packageName);
}
@Override
public void onPackageDataCleared(String packageName, int uid) {
final int userId = getChangingUserId();
Slog.i(LOG_TAG, "onPackageDataCleared() u" + userId + "/" + packageName);
clearAssociationForPackage(userId, packageName);
}
@Override
public void onPackageModified(String packageName) {
Slog.d(LOG_TAG, "onPackageModified(packageName = " + packageName + ")");
int userId = getChangingUserId();
forEach(getAssociations(userId, packageName), association -> {
updateSpecialAccessPermissionForAssociatedPackage(association);
});
}
final int userId = getChangingUserId();
Slog.i(LOG_TAG, "onPackageModified() u" + userId + "/" + packageName);
forEach(getAssociations(userId, packageName), association ->
updateSpecialAccessPermissionForAssociatedPackage(association));
}
}.register(getContext(), FgThread.get().getLooper(), UserHandle.ALL, true);
}
@@ -742,6 +744,14 @@ public class CompanionDeviceManagerService extends SystemService {
restartBleScan();
}
void clearAssociationForPackage(@UserIdInt int userId, @NonNull String packageName) {
if (DEBUG) Slog.d(LOG_TAG, "clearAssociationForPackage() u" + userId + "/" + packageName);
mCompanionDevicePresenceController.unbindDevicePresenceListener(packageName, userId);
updateAssociations(set -> filterOut(set, it -> it.belongsToPackage(userId, packageName)),
userId);
}
private void markIdAsPreviouslyUsedForPackage(
int associationId, @UserIdInt int userId, @NonNull String packageName) {
synchronized (mLock) {