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

Commit 57556b65 authored by Patrick Baumann's avatar Patrick Baumann
Browse files

Simplify feature enablement to a single constant 

In an effort to keep CL that enables app enumeration as simple as
possible, this change collapses several inline booleans to a single
constant boolean.

Test: atest AppEnumerationTests
Bug: 136675067
Change-Id: Iac4b2fceb61d5680baf6fac76d58ee4525c615bd
parent 68fe9164

services/core/java/com/android/server/pm/AppsFilter.java

+6 −6
Original line number Diff line number Diff line
@@ -68,9 +68,8 @@ public class AppsFilter { 


    // Logs all filtering instead of enforcing

    private static final boolean DEBUG_ALLOW_ALL = false;



    @SuppressWarnings("ConstantExpression")

    private static final boolean DEBUG_LOGGING = false | DEBUG_ALLOW_ALL;

    private static final boolean DEBUG_LOGGING = false;

    private static final boolean FEATURE_ENABLED_BY_DEFAULT = false;



    /**

     * This contains a list of app UIDs that are implicitly queryable because another app explicitly
@@ -136,7 +135,7 @@ public class AppsFilter { 
    private static class FeatureConfigImpl implements FeatureConfig {

        private static final String FILTERING_ENABLED_NAME = "package_query_filtering_enabled";

        private final PackageManagerService.Injector mInjector;

        private volatile boolean mFeatureEnabled = false;

        private volatile boolean mFeatureEnabled = FEATURE_ENABLED_BY_DEFAULT;



        private FeatureConfigImpl(PackageManagerService.Injector injector) {

            mInjector = injector;
@@ -145,14 +144,15 @@ public class AppsFilter { 
        @Override

        public void onSystemReady() {

            mFeatureEnabled = DeviceConfig.getBoolean(

                    NAMESPACE_PACKAGE_MANAGER_SERVICE, FILTERING_ENABLED_NAME, false);

                    NAMESPACE_PACKAGE_MANAGER_SERVICE, FILTERING_ENABLED_NAME,

                    FEATURE_ENABLED_BY_DEFAULT);

            DeviceConfig.addOnPropertiesChangedListener(

                    NAMESPACE_PACKAGE_MANAGER_SERVICE, FgThread.getExecutor(),

                    properties -> {

                        if (properties.getKeyset().contains(FILTERING_ENABLED_NAME)) {

                            synchronized (FeatureConfigImpl.this) {

                                mFeatureEnabled = properties.getBoolean(FILTERING_ENABLED_NAME,

                                        false);

                                        FEATURE_ENABLED_BY_DEFAULT);

                            }

                        }

                    });