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

Commit c3f1054b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AppCompatOverridesService: Remove finalizer and unregistration logic"... 

Merge "AppCompatOverridesService: Remove finalizer and unregistration logic" into main am: 5912056d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3513971



Change-Id: I2bf3415a9b20fd62ed38d3011e71653eca11beee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 588f6bef 5912056d

services/core/java/com/android/server/compat/overrides/AppCompatOverridesService.java

+0 −24
Original line number Original line Diff line number Diff line
@@ -103,12 +103,6 @@ public final class AppCompatOverridesService { 
        }

        }

    }

    }





    @Override

    public void finalize() {

        unregisterDeviceConfigListeners();

        unregisterPackageReceiver();

    }



    @VisibleForTesting

    @VisibleForTesting

    void registerDeviceConfigListeners() {

    void registerDeviceConfigListeners() {

        for (DeviceConfigListener listener : mDeviceConfigListeners) {

        for (DeviceConfigListener listener : mDeviceConfigListeners) {
@@ -116,21 +110,11 @@ public final class AppCompatOverridesService { 
        }

        }

    }

    }





    private void unregisterDeviceConfigListeners() {

        for (DeviceConfigListener listener : mDeviceConfigListeners) {

            listener.unregister();

        }

    }



    @VisibleForTesting

    @VisibleForTesting

    void registerPackageReceiver() {

    void registerPackageReceiver() {

        mPackageReceiver.register();

        mPackageReceiver.register();

    }

    }





    private void unregisterPackageReceiver() {

        mPackageReceiver.unregister();

    }



    /**

    /**

     * Same as {@link #applyOverrides(Properties, Set, Map)} except all properties of the given

     * Same as {@link #applyOverrides(Properties, Set, Map)} except all properties of the given

     * {@code namespace} are fetched via {@link DeviceConfig#getProperties}.

     * {@code namespace} are fetched via {@link DeviceConfig#getProperties}.
@@ -374,10 +358,6 @@ public final class AppCompatOverridesService { 
                    this);

                    this);

        }

        }





        private void unregister() {

            DeviceConfig.removeOnPropertiesChangedListener(this);

        }



        @Override

        @Override

        public void onPropertiesChanged(Properties properties) {

        public void onPropertiesChanged(Properties properties) {

            boolean removeOverridesFlagChanged = properties.getKeyset().contains(

            boolean removeOverridesFlagChanged = properties.getKeyset().contains(
@@ -426,10 +406,6 @@ public final class AppCompatOverridesService { 
                    null, /* scheduler= */ null);

                    null, /* scheduler= */ null);

        }

        }





        private void unregister() {

            mContext.unregisterReceiver(this);

        }



        @Override

        @Override

        public void onReceive(@NonNull final Context context, @NonNull final Intent intent) {

        public void onReceive(@NonNull final Context context, @NonNull final Intent intent) {

            Uri data = intent.getData();

            Uri data = intent.getData();