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

Commit 21713487 authored by Eric Biggers's avatar Eric Biggers
Browse files

Remove flag android.security.significant_places 

Since this flag was launched, remove it and make the corresponding code
unconditional.

Bug: 337870680
Test: presubmit
Flag: EXEMPT removing android.security.significant_places
Change-Id: I14f9c67dd2b1fb115511b2c626bfb63a01cd84e2
parent 24897bdb

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"

services/core/java/com/android/server/trust/TrustManagerService.java

+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;

        }