From e2385be5e129322fa137dce0a53e025480bf66ba Mon Sep 17 00:00:00 2001 From: Jan Nordqvist Date: Mon, 26 Feb 2018 13:55:00 -0800 Subject: [PATCH] Fixed failing launch of Data usage activty from data saver suggestion. After introducing the new data usage UI behind a feature flag a bug was introduced that causes the data saver suggestion to throw an exception from a missing class reference in "legacy" mode. Bug: 73648306 Test: manual Change-Id: I4fcd2bd0f55931f40738266dca94a55fea5087b3 --- .../conditional/BackgroundDataCondition.java | 11 ++- .../BackgroundDataConditionTest.java | 88 +++++++++++++++++++ 2 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java diff --git a/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java b/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java index cbac86f2393..34172c277ec 100644 --- a/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java +++ b/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java @@ -18,9 +18,12 @@ package com.android.settings.dashboard.conditional; import android.content.Intent; import android.graphics.drawable.Icon; import android.net.NetworkPolicyManager; +import android.util.FeatureFlagUtils; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings; +import com.android.settings.core.FeatureFlags; public class BackgroundDataCondition extends Condition { @@ -55,8 +58,12 @@ public class BackgroundDataCondition extends Condition { @Override public void onPrimaryClick() { - mManager.getContext().startActivity(new Intent(mManager.getContext(), - Settings.DataUsageSummaryActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); + final Class activityClass = FeatureFlagUtils.isEnabled(mManager.getContext(), + FeatureFlags.DATA_USAGE_SETTINGS_V2) + ? Settings.DataUsageSummaryActivity.class + : Settings.DataUsageSummaryLegacyActivity.class; + mManager.getContext().startActivity(new Intent(mManager.getContext(), activityClass) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); } @Override diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java new file mode 100644 index 00000000000..be0da83f368 --- /dev/null +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.settings.dashboard.conditional; + +import android.content.Context; +import android.content.Intent; +import android.util.FeatureFlagUtils; + +import com.android.settings.Settings; +import com.android.settings.TestConfig; +import com.android.settings.core.FeatureFlags; +import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; +import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; + +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = + SettingsShadowSystemProperties.class) +public class BackgroundDataConditionTest { + @Mock + private ConditionManager mConditionManager; + + private Context mContext; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext = spy(RuntimeEnvironment.application); + when(mConditionManager.getContext()).thenReturn(mContext); + } + + @Test + public void onPrimaryClick_v2enabled_shouldReturnv2SummaryActivity() { + FeatureFlagUtils.setEnabled(mContext, FeatureFlags.DATA_USAGE_SETTINGS_V2, true); + + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(Intent.class); + BackgroundDataCondition backgroundDataCondition + = new BackgroundDataCondition(mConditionManager); + backgroundDataCondition.onPrimaryClick(); + verify(mContext).startActivity(argumentCaptor.capture()); + Intent intent = argumentCaptor.getValue(); + + assertThat(intent.getComponent().getClassName()).isEqualTo( + Settings.DataUsageSummaryActivity.class.getName()); + } + + @Test + public void onPrimaryClick_v2disabled_shouldReturnLegacySummaryActivity() { + FeatureFlagUtils.setEnabled(mContext, FeatureFlags.DATA_USAGE_SETTINGS_V2, false); + + final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(Intent.class); + BackgroundDataCondition backgroundDataCondition + = new BackgroundDataCondition(mConditionManager); + backgroundDataCondition.onPrimaryClick(); + verify(mContext).startActivity(argumentCaptor.capture()); + Intent intent = argumentCaptor.getValue(); + + assertThat(intent.getComponent().getClassName()).isEqualTo( + Settings.DataUsageSummaryLegacyActivity.class.getName()); + } +}