Merge "AppCompatOverridesService: Remove finalizer and unregistration logic" into main (5912056d) · Commits · e / os / android_frameworks_base

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

+0 −24

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

		@Override
		public void finalize() {
		unregisterDeviceConfigListeners();
		unregisterPackageReceiver();
		}

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

		private void unregisterDeviceConfigListeners() {
		for (DeviceConfigListener listener : mDeviceConfigListeners) {
		listener.unregister();
		}
		}

		@VisibleForTesting
		void registerPackageReceiver() {
		mPackageReceiver.register();
		}

		private void unregisterPackageReceiver() {
		mPackageReceiver.unregister();
		}

		/**
		* Same as {@link #applyOverrides(Properties, Set, Map)} except all properties of the given
		* {@code namespace} are fetched via {@link DeviceConfig#getProperties}.
		@@ -374,10 +358,6 @@ public final class AppCompatOverridesService {
		this);
		}

		private void unregister() {
		DeviceConfig.removeOnPropertiesChangedListener(this);
		}

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

		private void unregister() {
		mContext.unregisterReceiver(this);
		}

		@Override
		public void onReceive(@NonNull final Context context, @NonNull final Intent intent) {
		Uri data = intent.getData();