From bddf5149e56e3c9800ba41d9b3ad1addde650dae Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Mon, 27 May 2019 11:55:34 +0800 Subject: [PATCH] Fix the crash while tapping "app data usage" as second user Second user or guest is limited some mobile network access. We need to check current user is admin or not to decide the preferece page will be found in search or not. Bug: 133466016 Fixes: 133466016 Test: Manual test & make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.network Change-Id: I48d3064a8aa28ac1f2ac699b42a999b9682b1b52 --- .../network/MobileNetworkListFragment.java | 6 ++ .../telephony/MobileNetworkSettings.java | 6 ++ .../MobileNetworkListFragmentTest.java | 79 +++++++++++++++++++ .../telephony/MobileNetworkSettingsTest.java | 33 ++++++++ 4 files changed, 124 insertions(+) create mode 100644 tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java diff --git a/src/com/android/settings/network/MobileNetworkListFragment.java b/src/com/android/settings/network/MobileNetworkListFragment.java index c90827e6556..4690a288154 100644 --- a/src/com/android/settings/network/MobileNetworkListFragment.java +++ b/src/com/android/settings/network/MobileNetworkListFragment.java @@ -18,6 +18,7 @@ package com.android.settings.network; import android.app.settings.SettingsEnums; import android.content.Context; +import android.os.UserManager; import android.provider.SearchIndexableResource; import com.android.settings.R; @@ -66,5 +67,10 @@ public class MobileNetworkListFragment extends DashboardFragment { result.add(sir); return result; } + + @Override + protected boolean isPageSearchEnabled(Context context) { + return context.getSystemService(UserManager.class).isAdminUser(); + } }; } diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index f8e5c3a518f..838aa12f95f 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -277,5 +277,11 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment { result.add(sir); return result; } + + /** suppress full page if user is not admin */ + @Override + protected boolean isPageSearchEnabled(Context context) { + return context.getSystemService(UserManager.class).isAdminUser(); + } }; } diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java new file mode 100644 index 00000000000..a65ff24f455 --- /dev/null +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2019 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.network; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.os.UserManager; + +import com.android.settings.search.BaseSearchIndexProvider; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.util.ReflectionHelpers; + + +@RunWith(RobolectricTestRunner.class) +public class MobileNetworkListFragmentTest { + @Mock + private Context mContext; + @Mock + private UserManager mUserManager; + + private MobileNetworkListFragment mFragment; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mFragment = new MobileNetworkListFragment(); + } + + @Test + public void isPageSearchEnabled_adminUser_shouldReturnTrue() { + when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager); + when(mUserManager.isAdminUser()).thenReturn(true); + final BaseSearchIndexProvider provider = + (BaseSearchIndexProvider) mFragment.SEARCH_INDEX_DATA_PROVIDER; + + final Object obj = ReflectionHelpers.callInstanceMethod(provider, "isPageSearchEnabled", + ReflectionHelpers.ClassParameter.from(Context.class, mContext)); + final boolean isEnabled = (Boolean) obj; + + assertThat(isEnabled).isTrue(); + } + + @Test + public void isPageSearchEnabled_nonAdminUser_shouldReturnFalse() { + when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager); + when(mUserManager.isAdminUser()).thenReturn(false); + final BaseSearchIndexProvider provider = + (BaseSearchIndexProvider) mFragment.SEARCH_INDEX_DATA_PROVIDER; + + final Object obj = ReflectionHelpers.callInstanceMethod(provider, "isPageSearchEnabled", + ReflectionHelpers.ClassParameter.from(Context.class, mContext)); + final boolean isEnabled = (Boolean) obj; + + assertThat(isEnabled).isFalse(); + } +} diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java index a999a9ee1cf..4afe0fc1e05 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java @@ -30,6 +30,7 @@ import android.app.usage.NetworkStatsManager; import android.content.Context; import android.net.NetworkPolicyManager; import android.os.Bundle; +import android.os.UserManager; import android.provider.Settings; import android.telephony.TelephonyManager; @@ -38,6 +39,7 @@ import androidx.fragment.app.FragmentActivity; import com.android.settings.core.FeatureFlags; import com.android.settings.datausage.DataUsageSummaryPreferenceController; import com.android.settings.development.featureflags.FeatureFlagPersistent; +import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.core.AbstractPreferenceController; @@ -50,6 +52,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import org.robolectric.util.ReflectionHelpers; import java.util.List; @@ -135,4 +138,34 @@ public class MobileNetworkSettingsTest { mFragment.onActivityResult(REQUEST_CODE_DELETE_SUBSCRIPTION, 0, null); verify(mActivity).finish(); } + + @Test + public void isPageSearchEnabled_adminUser_shouldReturnTrue() { + final UserManager userManager = mock(UserManager.class); + when(mContext.getSystemService(UserManager.class)).thenReturn(userManager); + when(userManager.isAdminUser()).thenReturn(true); + final BaseSearchIndexProvider provider = + (BaseSearchIndexProvider) mFragment.SEARCH_INDEX_DATA_PROVIDER; + + final Object obj = ReflectionHelpers.callInstanceMethod(provider, "isPageSearchEnabled", + ReflectionHelpers.ClassParameter.from(Context.class, mContext)); + final boolean isEnabled = (Boolean) obj; + + assertThat(isEnabled).isTrue(); + } + + @Test + public void isPageSearchEnabled_nonAdminUser_shouldReturnFalse() { + final UserManager userManager = mock(UserManager.class); + when(mContext.getSystemService(UserManager.class)).thenReturn(userManager); + when(userManager.isAdminUser()).thenReturn(false); + final BaseSearchIndexProvider provider = + (BaseSearchIndexProvider) mFragment.SEARCH_INDEX_DATA_PROVIDER; + + final Object obj = ReflectionHelpers.callInstanceMethod(provider, "isPageSearchEnabled", + ReflectionHelpers.ClassParameter.from(Context.class, mContext)); + final boolean isEnabled = (Boolean) obj; + + assertThat(isEnabled).isFalse(); + } }