[CDM] Remove role holders onPackageRemoveOrDataClearInternal

Fix: 215661412

Test: CTS tests
Change-Id: Idfb7cc81c62b147edc474eefe72b11fdefff1485
This commit is contained in:
Guojing Yuan
2022-08-31 22:56:03 +00:00
parent bb4bc86045
commit 21c6a7f923

View File

@@ -17,7 +17,6 @@
package com.android.server.companion;
import static android.Manifest.permission.DELIVER_COMPANION_MESSAGES;
import static android.Manifest.permission.MANAGE_COMPANION_DEVICES;
import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE;
import static android.content.pm.PackageManager.CERT_INPUT_SHA256;
@@ -88,7 +87,6 @@ import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.ArraySet;
import android.util.Base64;
import android.util.ExceptionUtils;
import android.util.Log;
import android.util.Slog;
@@ -501,6 +499,10 @@ public class CompanionDeviceManagerService extends SystemService {
for (AssociationInfo association : associationsForPackage) {
mAssociationStore.removeAssociation(association.getId());
}
// Clear role holders
for (AssociationInfo association : associationsForPackage) {
maybeRemoveRoleHolderForAssociation(association);
}
mCompanionAppController.onPackagesChanged(userId);
}