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

Commit a2f498b8 authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge changes I6707b6f3,I815151cc into main 

* changes:
  Load reboot escrow data at PHASE_BOOT_COMPLETED
  Ensure that LockSettingsService waits for gatekeeperd to be ready
parents 45197e2b 042cd5d9

services/core/java/com/android/server/locksettings/BiometricDeferredQueue.java

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ public class BiometricDeferredQueue { 


    @Nullable

    private static synchronized IGateKeeperService getGatekeeperService() {

        final IBinder service = ServiceManager.getService(Context.GATEKEEPER_SERVICE);

        final IBinder service = ServiceManager.waitForService(Context.GATEKEEPER_SERVICE);

        if (service == null) {

            Slog.e(TAG, "Unable to acquire GateKeeperService");

            return null;

services/core/java/com/android/server/locksettings/LockSettingsService.java

+3 −3
Original line number Diff line number Diff line
@@ -311,8 +311,9 @@ public class LockSettingsService extends ILockSettings.Stub { 
            super.onBootPhase(phase);

            if (phase == PHASE_ACTIVITY_MANAGER_READY) {

                mLockSettingsService.migrateOldDataAfterSystemReady();

                mLockSettingsService.loadEscrowData();

                mLockSettingsService.deleteRepairModePersistentDataIfNeeded();

            } else if (phase == PHASE_BOOT_COMPLETED) {

                mLockSettingsService.loadEscrowData();

            }

        }
@@ -843,7 +844,6 @@ public class LockSettingsService extends ILockSettings.Stub { 
        mHasSecureLockScreen = mContext.getPackageManager()

                .hasSystemFeature(PackageManager.FEATURE_SECURE_LOCK_SCREEN);

        migrateOldData();

        getGateKeeperService();

        getAuthSecretHal();

        mDeviceProvisionedObserver.onSystemReady();
@@ -2599,7 +2599,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
            return mGateKeeperService;

        }



        final IBinder service = ServiceManager.getService(Context.GATEKEEPER_SERVICE);

        final IBinder service = ServiceManager.waitForService(Context.GATEKEEPER_SERVICE);

        if (service != null) {

            try {

                service.linkToDeath(new GateKeeperDiedRecipient(), 0);