Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 924df83d authored by Evan Chen's avatar Evan Chen Committed by Android Build Coastguard Worker
Browse files

Remove any revoked associations after reboot 

Test: manually
Bug: 442392902
Flag: EXEMPT bugfix
Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:13714bcfaff6ef1c16d0aa3d359b1c8bc1859ac3
Merged-In: I94b96d98608d6702e1d3a9581e135280149bf7e1
Change-Id: I94b96d98608d6702e1d3a9581e135280149bf7e1
parent bb15e7f1

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import static com.android.internal.util.CollectionUtils.any; 
import static com.android.internal.util.Preconditions.checkState;

import static com.android.server.companion.association.DisassociationProcessor.REASON_API;

import static com.android.server.companion.association.DisassociationProcessor.REASON_PKG_DATA_CLEARED;

import static com.android.server.companion.association.DisassociationProcessor.REASON_REVOKED;

import static com.android.server.companion.utils.PackageUtils.enforceUsesCompanionDeviceFeature;

import static com.android.server.companion.utils.PackageUtils.isRestrictedSettingsAllowed;

import static com.android.server.companion.utils.PermissionsUtils.enforceCallerCanManageAssociationsForPackage;
@@ -197,6 +198,11 @@ public class CompanionDeviceManagerService extends SystemService { 
        // Init association stores

        mAssociationStore.refreshCache();



        // Remove any revoked associations after reboot.

        for (AssociationInfo ai : mAssociationStore.getRevokedAssociations()) {

            mDisassociationProcessor.disassociate(ai.getId(), REASON_REVOKED);

        }



        // Init UUID store

        mObservableUuidStore.getObservableUuidsForUser(getContext().getUserId());