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

Commit e1defa04 authored Oct 09, 2023 by Eric Biggers Committed by Automerger Merge Worker Oct 09, 2023

Ensure that LockSettingsService waits for gatekeeperd to be ready am: e5946090 am: 9e9f7294

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775385

Change-Id: I7b8b624c1c14f106e5bce9d24d7ee4494fd464f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 5dd10554 9e9f7294

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -869,7 +869,6 @@ public class LockSettingsService extends ILockSettings.Stub {
		mHasSecureLockScreen = mContext.getPackageManager()
		.hasSystemFeature(PackageManager.FEATURE_SECURE_LOCK_SCREEN);
		migrateOldData();
		getGateKeeperService();
		getAuthSecretHal();
		mDeviceProvisionedObserver.onSystemReady();

		@@ -2635,7 +2634,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);