Convert SettingsLib Lifecycle to Flatfoot

Bug: 69257739
Test: m -j RunSettingsRoboTests
Change-Id: I27e7850c39afb9c09297007e8cc352f410665653
This commit is contained in:
Tony Mantler
2017-11-10 13:14:50 -08:00
parent 4f74ed2d07
commit 94a7c7d21c
45 changed files with 257 additions and 143 deletions

View File

@@ -59,7 +59,6 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
@@ -210,7 +209,7 @@ public class LanguageAndInputSettingsTest {
}
@Override
protected Lifecycle getLifecycle() {
public Lifecycle getLifecycle() {
if (mLifecycle == null) {
return super.getLifecycle();
}