diff options
| -rw-r--r-- | core/java/android/security/flags.aconfig | 7 | ||||
| -rw-r--r-- | services/core/java/com/android/server/trust/TrustManagerService.java | 66 |
2 files changed, 31 insertions, 42 deletions
diff --git a/core/java/android/security/flags.aconfig b/core/java/android/security/flags.aconfig index a2403826fe32..d39af3d2cf07 100644 --- a/core/java/android/security/flags.aconfig +++ b/core/java/android/security/flags.aconfig @@ -61,13 +61,6 @@ flag { } flag { - name: "significant_places" - namespace: "biometrics" - description: "Enabled significant place monitoring" - bug: "337870680" -} - -flag { name: "should_trust_manager_listen_for_primary_auth" namespace: "biometrics" description: "Causes TrustManagerService to listen for credential attempts and ignore reports from upstream" diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java index 708bca71eced..472a39f6eaa9 100644 --- a/services/core/java/com/android/server/trust/TrustManagerService.java +++ b/services/core/java/com/android/server/trust/TrustManagerService.java @@ -356,37 +356,35 @@ 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, - TrustManager.ACTION_BIND_SIGNIFICANT_PLACE_PROVIDER, - null, - null, - null), - new ServiceWatcher.ServiceListener<>() { - @Override - public void onBind(IBinder binder, - CurrentUserServiceSupplier.BoundServiceInfo service) - throws RemoteException { - ISignificantPlaceProvider.Stub.asInterface(binder) - .setSignificantPlaceProviderManager( - new ISignificantPlaceProviderManager.Stub() { - @Override - public void setInSignificantPlace( - boolean inSignificantPlace) { - mIsInSignificantPlace = inSignificantPlace; - } - }); - } + mSignificantPlaceServiceWatcher = ServiceWatcher.create(mContext, TAG, + CurrentUserServiceSupplier.create( + mContext, + TrustManager.ACTION_BIND_SIGNIFICANT_PLACE_PROVIDER, + null, + null, + null), + new ServiceWatcher.ServiceListener<>() { + @Override + public void onBind(IBinder binder, + CurrentUserServiceSupplier.BoundServiceInfo service) + throws RemoteException { + ISignificantPlaceProvider.Stub.asInterface(binder) + .setSignificantPlaceProviderManager( + new ISignificantPlaceProviderManager.Stub() { + @Override + public void setInSignificantPlace( + boolean inSignificantPlace) { + mIsInSignificantPlace = inSignificantPlace; + } + }); + } - @Override - public void onUnbind() { - mIsInSignificantPlace = false; - } - }); - mSignificantPlaceServiceWatcher.register(); - } + @Override + public void onUnbind() { + mIsInSignificantPlace = false; + } + }); + 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()); - } + mSignificantPlaceServiceWatcher.runOnBinder( + binder -> ISignificantPlaceProvider.Stub.asInterface(binder) + .onSignificantPlaceCheck()); return mIsInSignificantPlace; } |