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

Commit c22e789a authored by Guojing Yuan's avatar Guojing Yuan Committed by Android (Google) Code Review
Browse files

Merge "[CDM] Move exemption logic to onUserUnlocked" into main

parents 9557e44e dc750e26

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

+3 −2
Original line number Diff line number Diff line
@@ -231,8 +231,6 @@ public class CompanionDeviceManagerService extends SystemService { 
        if (associations.isEmpty()) return;



        mCompanionExemptionProcessor.updateAtm(userId, associations);

        ExecutorService executor = Executors.newSingleThreadExecutor();

        executor.execute(mCompanionExemptionProcessor::updateAutoRevokeExemptions);

    }



    @Override
@@ -240,6 +238,9 @@ public class CompanionDeviceManagerService extends SystemService { 
        Slog.i(TAG, "onUserUnlocked() user=" + user);

        // Notify and bind the app after the phone is unlocked.

        mDevicePresenceProcessor.sendDevicePresenceEventOnUnlocked(user.getUserIdentifier());



        ExecutorService executor = Executors.newSingleThreadExecutor();

        executor.execute(mCompanionExemptionProcessor::updateAutoRevokeExemptions);

    }



    private void onPackageRemoveOrDataClearedInternal(