Loading src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java +4 −11 Original line number Diff line number Diff line Loading @@ -24,13 +24,13 @@ import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import java.util.Map; public class FeatureFlagsPreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart { /** * A {@link BasePreferenceController} used in {@link FeatureFlagsDashboard} */ public class FeatureFlagsPreferenceController extends BasePreferenceController { private PreferenceGroup mGroup; Loading @@ -47,13 +47,6 @@ public class FeatureFlagsPreferenceController extends BasePreferenceController public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); mGroup = screen.findPreference(getPreferenceKey()); } @Override public void onStart() { if (mGroup == null) { return; } final Map<String, String> featureMap = FeatureFlagUtils.getAllFeatureFlags(); if (featureMap == null) { return; Loading tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java +1 −3 Original line number Diff line number Diff line Loading @@ -28,7 +28,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Build; import android.os.SystemProperties; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; Loading Loading @@ -77,9 +76,8 @@ public class FeatureFlagPreferenceControllerTest { @Test public void onStart_shouldRefreshFeatureFlags() { mController.onStart(); mController.displayPreference(mScreen); verify(mCategory).removeAll(); verify(mCategory, atLeastOnce()).addPreference(any(FeatureFlagPreference.class)); } } Loading
src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java +4 −11 Original line number Diff line number Diff line Loading @@ -24,13 +24,13 @@ import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import java.util.Map; public class FeatureFlagsPreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart { /** * A {@link BasePreferenceController} used in {@link FeatureFlagsDashboard} */ public class FeatureFlagsPreferenceController extends BasePreferenceController { private PreferenceGroup mGroup; Loading @@ -47,13 +47,6 @@ public class FeatureFlagsPreferenceController extends BasePreferenceController public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); mGroup = screen.findPreference(getPreferenceKey()); } @Override public void onStart() { if (mGroup == null) { return; } final Map<String, String> featureMap = FeatureFlagUtils.getAllFeatureFlags(); if (featureMap == null) { return; Loading
tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java +1 −3 Original line number Diff line number Diff line Loading @@ -28,7 +28,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Build; import android.os.SystemProperties; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; Loading Loading @@ -77,9 +76,8 @@ public class FeatureFlagPreferenceControllerTest { @Test public void onStart_shouldRefreshFeatureFlags() { mController.onStart(); mController.displayPreference(mScreen); verify(mCategory).removeAll(); verify(mCategory, atLeastOnce()).addPreference(any(FeatureFlagPreference.class)); } }