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

Clear CDM associations onPackageDataCleared

Browse Source 
Bug: 205926405
Test: atest CtsCompanionDevicesTestCases:AssociationsCleanUpTest
Change-Id: I17a5e94784136ad0406f0450ba6ef40ca99467f6
This commit is contained in:
Sergey Nikolaienkov
2021-11-26 13:38:55 +01:00
parent 7918a89b24
commit 58c458df25
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) {