diff options
| author | 2025-03-24 12:51:16 -0700 | |
|---|---|---|
| committer | 2025-03-24 12:51:16 -0700 | |
| commit | b552211dfbf687d17b95da2b60e24511846ce82a (patch) | |
| tree | f252d1d350714b1708e4453edea813850695ad47 /services | |
| parent | 8cfa5324209f7362e196c96ff355d6ac38c4231d (diff) | |
| parent | 21713487847eccc22f983043eaf024f8a2a33912 (diff) | |
Merge "Remove flag android.security.significant_places" into main
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/trust/TrustManagerService.java | 66 |
1 files changed, 31 insertions, 35 deletions
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; } |