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

Commit e4098a22 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:...

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

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

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

parents 0d762829 73ccc0fd

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
		@@ -871,7 +871,6 @@ public class LockSettingsService extends ILockSettings.Stub {
		mHasSecureLockScreen = mContext.getPackageManager()
		.hasSystemFeature(PackageManager.FEATURE_SECURE_LOCK_SCREEN);
		migrateOldData();
		getGateKeeperService();
		getAuthSecretHal();
		mDeviceProvisionedObserver.onSystemReady();

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