From da9d5a1f92635a102476d5208774a6ee9d5b8691 Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Tue, 16 Mar 2021 10:12:44 +0000 Subject: [PATCH] Revert "Use androidx LifecycleObserver for wiring up controller ..." Revert submission 13804074-controller-lifecycle Reason for revert: ag/182373167, see a crash related to this new cl. Reverted Changes: I39ac69f24:Use androidx LifecycleObserver for wiring up contr... I086620e31:Add javadoc about lifecycles for xml defined Contr... Fix: 182373167 Change-Id: I7e6d2e9e6fd363a3afdd3dbab24e7c3b36e9ed29 --- src/com/android/settings/dashboard/DashboardFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index 7acbd1997c5..1b2be809a6d 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -27,7 +27,6 @@ import android.util.Log; import androidx.annotation.CallSuper; import androidx.annotation.VisibleForTesting; -import androidx.lifecycle.LifecycleObserver; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; @@ -45,6 +44,7 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.widget.PrimarySwitchPreference; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.ProviderTile;