Merge "Remove flag android.security.significant_places" into main (b552211d) · Commits · e / os / android_frameworks_base

core/java/android/security/flags.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -60,13 +60,6 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		name: "significant_places"
		namespace: "biometrics"
		description: "Enabled significant place monitoring"
		bug: "337870680"
		}

		flag {
		name: "should_trust_manager_listen_for_primary_auth"
		namespace: "biometrics"

+31 −35

Original line number	Diff line number	Diff line
		@@ -356,7 +356,6 @@ public class TrustManagerService extends SystemService {
		refreshAgentList(UserHandle.USER_ALL);
		refreshDeviceLockedForUser(UserHandle.USER_ALL);

		if (android.security.Flags.significantPlaces()) {
		mSignificantPlaceServiceWatcher = ServiceWatcher.create(mContext, TAG,
		CurrentUserServiceSupplier.create(
		mContext,
		@@ -386,7 +385,6 @@ public class TrustManagerService extends SystemService {
		}
		});
		mSignificantPlaceServiceWatcher.register();
		}
		} else if (phase == SystemService.PHASE_BOOT_COMPLETED) {
		maybeEnableFactoryTrustAgents(UserHandle.USER_SYSTEM);
		}
		@@ -1910,11 +1908,9 @@ public class TrustManagerService extends SystemService {
		public boolean isInSignificantPlace() {
		super.isInSignificantPlace_enforcePermission();

		if (android.security.Flags.significantPlaces()) {
		mSignificantPlaceServiceWatcher.runOnBinder(
		binder -> ISignificantPlaceProvider.Stub.asInterface(binder)
		.onSignificantPlaceCheck());
		}
		return mIsInSignificantPlace;
		}