From 831f6302eef195fadd5744bee3d8a262d3c364a0 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 22 Nov 2017 13:07:50 -0800 Subject: [PATCH] Disable DevelopmentSettingsActivity by default And if for any reason monkey user is able to enter develop option page, we show nothing. And update some test to sdk 26. Change-Id: I3f985e7fe14bd290db73b8c46dd817591df02015 Fixes: 68707778 Test: robotests --- AndroidManifest.xml | 21 ++----------------- .../android/settings/SettingsActivity.java | 3 ++- .../DevelopmentSettingsDashboardFragment.java | 13 ++++++++++-- .../widget/ActionBarShadowControllerTest.java | 2 +- .../widget/ActionButtonPreferenceTest.java | 2 +- .../settings/widget/AppPreferenceTest.java | 2 +- .../widget/AppSwitchPreferenceTest.java | 2 +- .../widget/AspectRatioFrameLayoutTest.java | 2 +- .../widget/DefaultIndicatorSeekBarTest.java | 2 +- .../widget/EntityHeaderControllerTest.java | 2 +- .../FixedLineSummaryPreferenceTest.java | 2 +- .../widget/LoadingViewControllerTest.java | 2 +- .../widget/MasterSwitchPreferenceTest.java | 2 +- .../PreferenceCategoryControllerTest.java | 2 +- .../widget/RadioButtonPickerFragmentTest.java | 2 +- .../settings/widget/RingProgressBarTest.java | 2 +- .../widget/RtlCompatibleViewPagerTest.java | 2 +- .../widget/ScrollToParentEditTextTest.java | 2 +- .../settings/widget/SummaryUpdaterTest.java | 2 +- .../ValidatedEditTextPreferenceTest.java | 2 +- 20 files changed, 32 insertions(+), 39 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2d031ed1384..3ee67f7bc75 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1893,7 +1893,8 @@ android:label="@string/development_settings_title" android:icon="@drawable/ic_settings_development" android:taskAffinity="com.android.settings" - android:parentActivityName="Settings"> + android:parentActivityName="Settings" + android:enabled="false"> @@ -1962,15 +1963,6 @@ android:value="com.android.settings.print.PrintJobSettingsFragment" /> - - - - - @@ -1979,15 +1971,6 @@ android:label="@string/select_webview_provider_dialog_title"> - - - - - getPreferenceControllers(Context context) { + if (Utils.isMonkeyRunning()) { + mPreferenceControllers = new ArrayList<>(); + return null; + } mPreferenceControllers = buildPreferenceControllers(context, getActivity(), getLifecycle(), this /* devOptionsDashboardFragment */, new BluetoothA2dpConfigStore()); @@ -326,6 +329,9 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra } private void enableDeveloperOptions() { + if (Utils.isMonkeyRunning()) { + return; + } DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(getContext(), true); for (AbstractPreferenceController controller : mPreferenceControllers) { if (controller instanceof DeveloperOptionsPreferenceController) { @@ -335,6 +341,9 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra } private void disableDeveloperOptions() { + if (Utils.isMonkeyRunning()) { + return; + } DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(getContext(), false); final SystemPropPoker poker = SystemPropPoker.getInstance(); poker.blockPokes(); diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java index 0f3eb31bb4f..f69012e9f7f 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java @@ -45,7 +45,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class ActionBarShadowControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java index a080bc6929a..a2159676c91 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java @@ -40,7 +40,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class ActionButtonPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java index d4890942c6d..6481f8a57f6 100644 --- a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java @@ -33,7 +33,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class AppPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java index a7c8d7cdd90..81537a8c650 100644 --- a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java @@ -33,7 +33,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class AppSwitchPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java b/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java index dd6138cea50..4a192584e39 100644 --- a/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java +++ b/tests/robotests/src/com/android/settings/widget/AspectRatioFrameLayoutTest.java @@ -32,7 +32,7 @@ import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class AspectRatioFrameLayoutTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java index 7fcf3289c53..47a9aa61de2 100644 --- a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java @@ -29,7 +29,7 @@ import org.robolectric.annotation.Config; import static junit.framework.Assert.assertEquals; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class DefaultIndicatorSeekBarTest { private DefaultIndicatorSeekBar mDefaultIndicatorSeekBar; diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index 9c6ee457c42..af30e4f443d 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -58,7 +58,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class EntityHeaderControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java index 0d9a77bef58..5022ceb87e8 100644 --- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class FixedLineSummaryPreferenceTest { @Mock diff --git a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java index 09b52c8b83e..6ab2b179729 100644 --- a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class LoadingViewControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java index 1c449cc8183..c80c7b476d1 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java @@ -40,7 +40,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class MasterSwitchPreferenceTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java index 23aa378dad1..d8661bf7ea1 100644 --- a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java @@ -36,7 +36,7 @@ import java.util.ArrayList; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class PreferenceCategoryControllerTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java index 8ca68ae50b7..9fc5b2e7ce5 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java @@ -45,7 +45,7 @@ import java.util.ArrayList; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class RadioButtonPickerFragmentTest { diff --git a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java index a1a2f2452c5..0226c22eee1 100644 --- a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java @@ -31,7 +31,7 @@ import org.robolectric.annotation.Config; import static junit.framework.Assert.assertEquals; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class RingProgressBarTest { private Context mContext = RuntimeEnvironment.application; diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java index 78afc43026c..1072152712a 100644 --- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java +++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java @@ -36,7 +36,7 @@ import static com.google.common.truth.Truth.assertThat; @RunWith(SettingsRobolectricTestRunner.class) @Config( manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, + sdk = TestConfig.SDK_VERSION_O, shadows = {ShadowTextUtils.class} ) public class RtlCompatibleViewPagerTest { diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java index 57550156142..8e912596f22 100644 --- a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java +++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java @@ -41,7 +41,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowView; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class ScrollToParentEditTextTest { private static final int EDIT_TEXT_SIZE = 20; diff --git a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java index 2f42550b6e4..8dbe552d61a 100644 --- a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java @@ -34,7 +34,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class SummaryUpdaterTest { private Context mContext; diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java index 59be160dead..ff2332c07f0 100644 --- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java @@ -42,7 +42,7 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class ValidatedEditTextPreferenceTest { @Mock