diff --git a/res/values/config.xml b/res/values/config.xml index 8ae73539574..c4b7bb931a8 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -626,8 +626,4 @@ @string/config_settingsintelligence_package_name android.uid.system:1000 - - - true - diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml index 08d3e6cc928..9165745f472 100644 --- a/res/xml/my_device_info.xml +++ b/res/xml/my_device_info.xml @@ -57,7 +57,6 @@ android:order="3" android:title="@string/status_number" android:summary="@string/summary_placeholder" - settings:isPreferenceVisible="@bool/config_show_sim_info" settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController" settings:enableCopying="true"/> @@ -99,7 +98,6 @@ android:title="@string/sim_status_title" settings:keywords="@string/keywords_sim_status" android:summary="@string/summary_placeholder" - settings:isPreferenceVisible="@bool/config_show_sim_info" settings:enableCopying="true"/> @@ -121,7 +119,6 @@ android:summary="@string/summary_placeholder" settings:keywords="@string/keywords_imei_info" settings:enableCopying="true" - settings:isPreferenceVisible="@bool/config_show_sim_info" settings:controller="com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController"/> diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml index c9c576e6b1b..07e797a07c1 100644 --- a/res/xml/network_provider_internet.xml +++ b/res/xml/network_provider_internet.xml @@ -37,7 +37,6 @@ android:icon="@drawable/ic_calls_sms" android:order="-20" android:summary="@string/summary_placeholder" - settings:isPreferenceVisible="@bool/config_show_sim_info" settings:allowDividerBelow="true" settings:keywords="@string/calls_and_sms" settings:useAdminDisabledSummary="true" /> @@ -50,7 +49,6 @@ android:order="-15" settings:keywords="@string/keywords_more_mobile_networks" settings:userRestriction="no_config_mobile_networks" - settings:isPreferenceVisible="@bool/config_show_sim_info" settings:allowDividerAbove="true" settings:useAdminDisabledSummary="true" /> @@ -68,7 +66,6 @@ android:persistent="false" android:order="19" settings:userRestriction="no_config_mobile_networks" - settings:isPreferenceVisible="@bool/config_show_sim_info" settings:useAdminDisabledSummary="true" /> diff --git a/res/xml/security_advanced_settings.xml b/res/xml/security_advanced_settings.xml index b36fc73fdd2..6d43fe77451 100644 --- a/res/xml/security_advanced_settings.xml +++ b/res/xml/security_advanced_settings.xml @@ -64,7 +64,6 @@ android:order="50" android:key="sim_lock_settings" android:title="@string/sim_lock_settings_category" - settings:isPreferenceVisible="@bool/config_show_sim_info" settings:controller="com.android.settings.security.SimLockPreferenceController"> diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index 8e54e3196f7..71eb0f20e30 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -174,9 +174,8 @@ public class IccLockSettings extends SettingsPreferenceFragment public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (Utils.isMonkeyRunning() || - !SubscriptionUtil.isSimHardwareVisible(getContext())) { - finishFragment(); + if (Utils.isMonkeyRunning()) { + finish(); return; } diff --git a/src/com/android/settings/MainClear.java b/src/com/android/settings/MainClear.java index 1434d7216a9..2b0f01036ea 100644 --- a/src/com/android/settings/MainClear.java +++ b/src/com/android/settings/MainClear.java @@ -64,7 +64,6 @@ import androidx.annotation.VisibleForTesting; import com.android.settings.core.InstrumentedFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; -import com.android.settings.network.SubscriptionUtil; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ConfirmLockPattern; import com.android.settingslib.RestrictedLockUtilsInternal; @@ -382,14 +381,6 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis mScrollView.getViewTreeObserver().addOnGlobalLayoutListener(this); } - /** - * Whether to show any UI which is SIM related. - */ - @VisibleForTesting - boolean showAnySubscriptionInfo(Context context) { - return (context != null) && SubscriptionUtil.isSimHardwareVisible(context); - } - /** * Whether to show strings indicating that the eUICC will be wiped. * @@ -399,7 +390,7 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis @VisibleForTesting boolean showWipeEuicc() { Context context = getContext(); - if (!showAnySubscriptionInfo(context) || !isEuiccEnabled(context)) { + if (!isEuiccEnabled(context)) { return false; } ContentResolver cr = context.getContentResolver(); diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java index 7635041ee46..688e2abe71e 100644 --- a/src/com/android/settings/ResetNetwork.java +++ b/src/com/android/settings/ResetNetwork.java @@ -235,9 +235,6 @@ public class ResetNetwork extends InstrumentedFragment { } private List getActiveSubscriptionInfoList() { - if (!SubscriptionUtil.isSimHardwareVisible(getActivity())) { - return Collections.emptyList(); - } SubscriptionManager mgr = getActivity().getSystemService(SubscriptionManager.class); if (mgr == null) { Log.w(TAG, "No SubscriptionManager"); @@ -267,9 +264,6 @@ public class ResetNetwork extends InstrumentedFragment { } private boolean showEuiccSettings(Context context) { - if (!SubscriptionUtil.isSimHardwareVisible(context)) { - return false; - } EuiccManager euiccManager = (EuiccManager) context.getSystemService(Context.EUICC_SERVICE); if (!euiccManager.isEnabled()) { diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java index f91b98f249e..eb8add5dbe9 100644 --- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java @@ -29,7 +29,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.network.SubscriptionUtil; import com.android.settingslib.DeviceInfoUtils; import java.util.ArrayList; @@ -52,8 +51,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { @Override public int getAvailabilityStatus() { - return SubscriptionUtil.isSimHardwareVisible(mContext) ? - AVAILABLE : UNSUPPORTED_ON_DEVICE; + return mTelephonyManager.isVoiceCapable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override @@ -81,9 +79,6 @@ public class PhoneNumberPreferenceController extends BasePreferenceController { @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); - if (!SubscriptionUtil.isSimHardwareVisible(mContext)) { - return; - } final Preference preference = screen.findPreference(getPreferenceKey()); final PreferenceCategory category = screen.findPreference(KEY_PREFERENCE_CATEGORY); mPreferenceList.add(preference); diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java index 9b7359b0c8d..e90477270e0 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java @@ -33,7 +33,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.deviceinfo.PhoneNumberSummaryPreference; -import com.android.settings.network.SubscriptionUtil; import com.android.settingslib.Utils; import java.util.ArrayList; @@ -64,9 +63,6 @@ public class ImeiInfoPreferenceController extends BasePreferenceController { @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); - if (!SubscriptionUtil.isSimHardwareVisible(mContext)) { - return; - } final Preference preference = screen.findPreference(getPreferenceKey()); final PreferenceCategory category = screen.findPreference(KEY_PREFERENCE_CATEGORY); @@ -123,8 +119,7 @@ public class ImeiInfoPreferenceController extends BasePreferenceController { @Override public int getAvailabilityStatus() { - return SubscriptionUtil.isSimHardwareVisible(mContext) && - mContext.getSystemService(UserManager.class).isAdminUser() + return mContext.getSystemService(UserManager.class).isAdminUser() && !Utils.isWifiOnly(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java index f811d2a86d2..e392bd6cc90 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java @@ -29,7 +29,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settings.network.SubscriptionUtil; import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController; import java.util.ArrayList; @@ -60,18 +59,9 @@ public class SimStatusPreferenceController extends return KEY_SIM_STATUS; } - @Override - public boolean isAvailable() { - return SubscriptionUtil.isSimHardwareVisible(mContext) && - super.isAvailable(); - } - @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); - if (!SubscriptionUtil.isSimHardwareVisible(mContext)) { - return; - } final Preference preference = screen.findPreference(getPreferenceKey()); if (!isAvailable() || preference == null || !preference.isVisible()) { return; diff --git a/src/com/android/settings/network/EraseEuiccDataController.java b/src/com/android/settings/network/EraseEuiccDataController.java index 091b6d7748c..b1f964b2190 100644 --- a/src/com/android/settings/network/EraseEuiccDataController.java +++ b/src/com/android/settings/network/EraseEuiccDataController.java @@ -51,8 +51,7 @@ public class EraseEuiccDataController extends BasePreferenceController { @Override public int getAvailabilityStatus() { - return SubscriptionUtil.isSimHardwareVisible(mContext) && - mContext.getPackageManager().hasSystemFeature( + return mContext.getPackageManager().hasSystemFeature( PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE; } diff --git a/src/com/android/settings/network/MobileNetworkListFragment.java b/src/com/android/settings/network/MobileNetworkListFragment.java index ea7031ae132..7881690e106 100644 --- a/src/com/android/settings/network/MobileNetworkListFragment.java +++ b/src/com/android/settings/network/MobileNetworkListFragment.java @@ -60,10 +60,6 @@ public class MobileNetworkListFragment extends DashboardFragment { @Override protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); - if (!SubscriptionUtil.isSimHardwareVisible(getContext())) { - finish(); - return controllers; - } NetworkProviderSimsCategoryController simCategoryPrefCtrl = new NetworkProviderSimsCategoryController(context, KEY_PREFERENCE_CATEGORY_SIM, @@ -92,8 +88,7 @@ public class MobileNetworkListFragment extends DashboardFragment { @Override protected boolean isPageSearchEnabled(Context context) { - return SubscriptionUtil.isSimHardwareVisible(context) && - context.getSystemService(UserManager.class).isAdminUser(); + return context.getSystemService(UserManager.class).isAdminUser(); } }; } diff --git a/src/com/android/settings/network/MobileNetworkSummaryController.java b/src/com/android/settings/network/MobileNetworkSummaryController.java index 61dd079cb35..1a85a7fa341 100644 --- a/src/com/android/settings/network/MobileNetworkSummaryController.java +++ b/src/com/android/settings/network/MobileNetworkSummaryController.java @@ -206,8 +206,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController @Override public boolean isAvailable() { - return SubscriptionUtil.isSimHardwareVisible(mContext) && - !Utils.isWifiOnly(mContext) && mUserManager.isAdminUser(); + return !Utils.isWifiOnly(mContext) && mUserManager.isAdminUser(); } @Override diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsController.java b/src/com/android/settings/network/NetworkProviderCallsSmsController.java index 585c99e0bbe..c8b1c49b7bf 100644 --- a/src/com/android/settings/network/NetworkProviderCallsSmsController.java +++ b/src/com/android/settings/network/NetworkProviderCallsSmsController.java @@ -190,8 +190,7 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl @Override public boolean isAvailable() { - return SubscriptionUtil.isSimHardwareVisible(mContext) && - mUserManager.isAdminUser(); + return mUserManager.isAdminUser(); } @Override diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java index b2cf74e0a82..aad9b10403c 100644 --- a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java +++ b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java @@ -100,8 +100,7 @@ public class NetworkProviderCallsSmsFragment extends DashboardFragment { @Override protected boolean isPageSearchEnabled(Context context) { - return SubscriptionUtil.isSimHardwareVisible(context) && - context.getSystemService(UserManager.class).isAdminUser(); + return context.getSystemService(UserManager.class).isAdminUser(); } }; } diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java index 5c9557c3fdb..ec17dd371b1 100644 --- a/src/com/android/settings/network/NetworkProviderSettings.java +++ b/src/com/android/settings/network/NetworkProviderSettings.java @@ -341,18 +341,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment } } - /** - * Whether to show any UI which is SIM related. - */ - @VisibleForTesting - boolean showAnySubscriptionInfo(Context context) { - return (context != null) && SubscriptionUtil.isSimHardwareVisible(context); - } - private void addNetworkMobileProviderController() { - if (!showAnySubscriptionInfo(getContext())) { - return; - } if (mNetworkMobileProviderController == null) { mNetworkMobileProviderController = new NetworkMobileProviderController( getContext(), PREF_KEY_PROVIDER_MOBILE_NETWORK); diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java index ccfcfb0a752..0bba86fafed 100644 --- a/src/com/android/settings/network/SubscriptionUtil.java +++ b/src/com/android/settings/network/SubscriptionUtil.java @@ -86,14 +86,6 @@ public class SubscriptionUtil { return subscriptions; } - /** - * Check if SIM hardware is visible to the end user. - */ - public static boolean isSimHardwareVisible(Context context) { - return context.getResources() - .getBoolean(R.bool.config_show_sim_info); - } - @VisibleForTesting static boolean isInactiveInsertedPSim(UiccSlotInfo slotInfo) { if (slotInfo == null) { diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index 05e58e96ed7..94b6aaf1bcc 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -120,10 +120,6 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings { @Override protected List createPreferenceControllers(Context context) { - if (!SubscriptionUtil.isSimHardwareVisible(context)) { - finish(); - return Arrays.asList(); - } if (getArguments() == null) { Intent intent = getIntent(); if (intent != null) { @@ -402,8 +398,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings { /** suppress full page if user is not admin */ @Override protected boolean isPageSearchEnabled(Context context) { - return SubscriptionUtil.isSimHardwareVisible(context) && - context.getSystemService(UserManager.class).isAdminUser(); + return context.getSystemService(UserManager.class).isAdminUser(); } }; diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java index d44eadace08..839a98cdb32 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java +++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java @@ -261,9 +261,6 @@ public class MobileNetworkUtils { * the user has enabled development mode. */ public static boolean showEuiccSettings(Context context) { - if (!SubscriptionUtil.isSimHardwareVisible(context)) { - return false; - } long timeForAccess = SystemClock.elapsedRealtime(); try { Boolean isShow = ((Future) ThreadUtils.postOnBackgroundThread(() -> { @@ -1013,10 +1010,6 @@ public class MobileNetworkUtils { } public static void launchMobileNetworkSettings(Context context, SubscriptionInfo info) { - if (!SubscriptionUtil.isSimHardwareVisible(context)) { - Log.e(TAG, "launchMobileNetworkSettings fail, device without such UI."); - return; - } final int subId = info.getSubscriptionId(); if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { Log.d(TAG, "launchMobileNetworkSettings fail, subId is invalid."); diff --git a/src/com/android/settings/security/SimLockPreferenceController.java b/src/com/android/settings/security/SimLockPreferenceController.java index 8429a9f352c..7cd01732400 100644 --- a/src/com/android/settings/security/SimLockPreferenceController.java +++ b/src/com/android/settings/security/SimLockPreferenceController.java @@ -28,7 +28,6 @@ import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; -import com.android.settings.network.SubscriptionUtil; import java.util.List; @@ -51,10 +50,6 @@ public class SimLockPreferenceController extends BasePreferenceController { @Override public int getAvailabilityStatus() { - if (!SubscriptionUtil.isSimHardwareVisible(mContext)) { - return UNSUPPORTED_ON_DEVICE; - } - final List subInfoList = mSubscriptionManager.getActiveSubscriptionInfoList(); diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java index db190d9249b..732277b3d8a 100644 --- a/src/com/android/settings/sim/SimDialogActivity.java +++ b/src/com/android/settings/sim/SimDialogActivity.java @@ -35,7 +35,6 @@ import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; import com.android.settings.R; -import com.android.settings.network.SubscriptionUtil; import com.android.settings.network.telephony.SubscriptionActionDialogActivity; import java.util.List; @@ -66,11 +65,6 @@ public class SimDialogActivity extends FragmentActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (!SubscriptionUtil.isSimHardwareVisible(this)) { - Log.d(TAG, "Not support on device without SIM."); - finish(); - return; - } getWindow().addSystemFlags( WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); showOrUpdateDialog(); diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java index c26e8f61841..5902b926020 100644 --- a/src/com/android/settings/sim/SimSelectNotification.java +++ b/src/com/android/settings/sim/SimSelectNotification.java @@ -77,10 +77,6 @@ public class SimSelectNotification extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - if (!SubscriptionUtil.isSimHardwareVisible(context)) { - Log.w(TAG, "Received unexpected intent with null action."); - return; - } String action = intent.getAction(); if (action == null) { diff --git a/src/com/android/settings/sim/smartForwarding/SmartForwardingActivity.java b/src/com/android/settings/sim/smartForwarding/SmartForwardingActivity.java index 070e65a1d56..217801e5a17 100644 --- a/src/com/android/settings/sim/smartForwarding/SmartForwardingActivity.java +++ b/src/com/android/settings/sim/smartForwarding/SmartForwardingActivity.java @@ -38,7 +38,6 @@ import androidx.core.content.ContextCompat; import com.android.settings.R; import com.android.settings.core.SettingsBaseActivity; -import com.android.settings.network.SubscriptionUtil; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -49,7 +48,6 @@ import com.google.common.util.concurrent.MoreExecutors; import java.util.concurrent.Executors; public class SmartForwardingActivity extends SettingsBaseActivity { - static final String LOG_TAG = SmartForwardingActivity.class.toString(); final ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor()); @@ -57,12 +55,6 @@ public class SmartForwardingActivity extends SettingsBaseActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (!SubscriptionUtil.isSimHardwareVisible(this)) { - Log.d(LOG_TAG, "Not support on device without SIM."); - finish(); - return; - } - final Toolbar toolbar = findViewById(R.id.action_bar); toolbar.setVisibility(View.VISIBLE); setActionBar(toolbar); @@ -174,4 +166,4 @@ public class SmartForwardingActivity extends SettingsBaseActivity { .create(); mDialog.show(); } -} +} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/MainClearTest.java b/tests/robotests/src/com/android/settings/MainClearTest.java index 9795092a657..ec33fadfd02 100644 --- a/tests/robotests/src/com/android/settings/MainClearTest.java +++ b/tests/robotests/src/com/android/settings/MainClearTest.java @@ -102,10 +102,7 @@ public class MainClearTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mMainClear = spy(new MainClear() { - @Override - boolean showAnySubscriptionInfo(Context context) { return true; } - }); + mMainClear = spy(new MainClear()); mActivity = Robolectric.setupActivity(FragmentActivity.class); mShadowActivity = Shadows.shadowOf(mActivity); UserManager userManager = mActivity.getSystemService(UserManager.class); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java index bae629ced42..55194add83d 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -29,7 +29,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import android.content.res.Resources; import android.os.UserManager; import android.telephony.TelephonyManager; @@ -70,18 +69,12 @@ public class ImeiInfoPreferenceControllerTest { private PreferenceCategory mCategory; private Context mContext; - private Resources mResources; private ImeiInfoPreferenceController mController; @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); - - mResources = spy(mContext.getResources()); - when(mContext.getResources()).thenReturn(mResources); - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); - doReturn(mUserManager).when(mContext).getSystemService(UserManager.class); mController = spy(new ImeiInfoPreferenceController(mContext, "imei_info")); mController.setHost(mFragment); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java index 4ffaf7ae6ec..85a6fac765a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import android.content.res.Resources; import android.telephony.TelephonyManager; import androidx.fragment.app.Fragment; @@ -65,18 +64,12 @@ public class SimStatusPreferenceControllerTest { private PreferenceCategory mCategory; private Context mContext; - private Resources mResources; private SimStatusPreferenceController mController; @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); - - mResources = spy(mContext.getResources()); - when(mContext.getResources()).thenReturn(mResources); - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); - doReturn(mUserManager).when(mContext).getSystemService(UserManager.class); mController = spy(new SimStatusPreferenceController(mContext, mFragment)); doReturn(true).when(mController).isAvailable(); diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java index 2e04ea751f0..fd2b520929f 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkListFragmentTest.java @@ -21,10 +21,8 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import android.content.res.Resources; import android.os.UserManager; -import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import org.junit.Before; @@ -40,8 +38,6 @@ public class MobileNetworkListFragmentTest { @Mock private Context mContext; @Mock - private Resources mResources; - @Mock private UserManager mUserManager; private MobileNetworkListFragment mFragment; @@ -59,9 +55,6 @@ public class MobileNetworkListFragmentTest { final BaseSearchIndexProvider provider = (BaseSearchIndexProvider) mFragment.SEARCH_INDEX_DATA_PROVIDER; - when(mContext.getResources()).thenReturn(mResources); - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); - final Object obj = ReflectionHelpers.callInstanceMethod(provider, "isPageSearchEnabled", ReflectionHelpers.ClassParameter.from(Context.class, mContext)); final boolean isEnabled = (Boolean) obj; @@ -76,9 +69,6 @@ public class MobileNetworkListFragmentTest { final BaseSearchIndexProvider provider = (BaseSearchIndexProvider) mFragment.SEARCH_INDEX_DATA_PROVIDER; - when(mContext.getResources()).thenReturn(mResources); - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); - final Object obj = ReflectionHelpers.callInstanceMethod(provider, "isPageSearchEnabled", ReflectionHelpers.ClassParameter.from(Context.class, mContext)); final boolean isEnabled = (Boolean) obj; diff --git a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java index a0b1797d22f..1424d0eced1 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java @@ -145,10 +145,7 @@ public class NetworkProviderSettingsTest { @Before public void setUp() { - mNetworkProviderSettings = spy(new NetworkProviderSettings() { - @Override - boolean showAnySubscriptionInfo(Context context) { return true; } - }); + mNetworkProviderSettings = spy(new NetworkProviderSettings()); doReturn(mContext).when(mNetworkProviderSettings).getContext(); doReturn(mPreferenceManager).when(mNetworkProviderSettings).getPreferenceManager(); doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class); 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 3e219a412ce..44611cec616 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSettingsTest.java @@ -29,7 +29,6 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.app.usage.NetworkStatsManager; import android.content.Context; -import android.content.res.Resources; import android.net.NetworkPolicyManager; import android.os.Bundle; import android.os.UserManager; @@ -38,7 +37,6 @@ import android.telephony.TelephonyManager; import androidx.fragment.app.FragmentActivity; -import com.android.settings.R; import com.android.settings.datausage.DataUsageSummaryPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; @@ -70,18 +68,12 @@ public class MobileNetworkSettingsTest { private FragmentActivity mActivity; private Context mContext; - private Resources mResources; private MobileNetworkSettings mFragment; @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = spy(RuntimeEnvironment.application); - - mResources = spy(mContext.getResources()); - when(mContext.getResources()).thenReturn(mResources); - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); - when(mActivity.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager); when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager); when(mContext.getSystemService(NetworkStatsManager.class)).thenReturn(mNetworkStatsManager); diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java index f38cc4948d4..ef5973c1d5b 100644 --- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java @@ -22,11 +22,9 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; -import android.content.res.Resources; import android.os.PersistableBundle; import android.os.UserManager; import android.telephony.CarrierConfigManager; @@ -37,7 +35,6 @@ import android.telephony.TelephonyManager; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import org.junit.Before; @@ -69,7 +66,6 @@ public class SimLockPreferenceControllerTest { private SimLockPreferenceController mController; private Preference mPreference; private Context mContext; - private Resources mResources; @Before public void setUp() { @@ -80,28 +76,15 @@ public class SimLockPreferenceControllerTest { shadowApplication.setSystemService(Context.CARRIER_CONFIG_SERVICE, mCarrierManager); shadowApplication.setSystemService(Context.USER_SERVICE, mUserManager); shadowApplication.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager); - mContext = spy(RuntimeEnvironment.application); - - mResources = spy(mContext.getResources()); - when(mContext.getResources()).thenReturn(mResources); - + mContext = RuntimeEnvironment.application; mController = new SimLockPreferenceController(mContext, "key"); mPreference = new Preference(mContext); mPreference.setKey(mController.getPreferenceKey()); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); } - @Test - public void isAvailable_notShowSimUi_false() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(false); - - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE); - } - @Test public void isAvailable_notAdmin_false() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); when(mUserManager.isAdminUser()).thenReturn(false); assertThat(mController.getAvailabilityStatus()) @@ -110,7 +93,6 @@ public class SimLockPreferenceControllerTest { @Test public void isAvailable_simIccNotReady_false() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); when(mUserManager.isAdminUser()).thenReturn(true); assertThat(mController.getAvailabilityStatus()) @@ -142,7 +124,6 @@ public class SimLockPreferenceControllerTest { @Test public void displayPreference_simReady_enablePreference() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); mController.displayPreference(mScreen); assertThat(mPreference.isEnabled()).isFalse(); @@ -159,14 +140,12 @@ public class SimLockPreferenceControllerTest { @Test public void getPreferenceKey_whenGivenValue_returnsGivenValue() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); mController = new SimLockPreferenceController(mContext, "key"); assertThat(mController.getPreferenceKey()).isEqualTo("key"); } private void setupMockIcc() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); final List subscriptionInfoList = new ArrayList<>(); SubscriptionInfo info = mock(SubscriptionInfo.class); subscriptionInfoList.add(info); @@ -177,7 +156,6 @@ public class SimLockPreferenceControllerTest { } private void setupMockSimReady() { - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); final List subscriptionInfoList = new ArrayList<>(); SubscriptionInfo info = mock(SubscriptionInfo.class); subscriptionInfoList.add(info); diff --git a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java index e4c8a63a0be..10e291cf2c0 100644 --- a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java +++ b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java @@ -42,7 +42,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.clearInvocations; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -138,7 +137,6 @@ public class SimSelectNotificationTest { when(mSubInfo.getDisplayName()).thenReturn(mFakeDisplayName); when(mContext.getResources()).thenReturn(mResources); - when(mResources.getBoolean(R.bool.config_show_sim_info)).thenReturn(true); when(mResources.getText(R.string.enable_sending_mms_notification_title)) .thenReturn(mFakeNotificationTitle); when(mResources.getText(R.string.enable_mms_notification_channel_title)) @@ -238,9 +236,6 @@ public class SimSelectNotificationTest { @Test public void onReceivePrimarySubListChange_WithDismissExtra_shouldDismiss() { - doReturn(mExecutor).when(mActivity).getMainExecutor(); - SimDialogProhibitService.supportDismiss(mActivity); - Intent intent = new Intent(TelephonyManager.ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED); intent.putExtra(EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE, EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA); diff --git a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java index 63dca7e88eb..43a32b51fbc 100644 --- a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java +++ b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java @@ -25,14 +25,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; -import android.content.res.Resources; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.TextUtils; -import com.android.settings.R; - import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -61,8 +58,6 @@ public class SubscriptionUtilTest { private SubscriptionManager mSubMgr; @Mock private TelephonyManager mTelMgr; - @Mock - private Resources mResources; @Before @@ -448,22 +443,4 @@ public class SubscriptionUtilTest { public void isInactiveInsertedPSim_nullSubInfo_doesNotCrash() { assertThat(SubscriptionUtil.isInactiveInsertedPSim(null)).isFalse(); } - - @Test - public void isSimHardwareVisible_configAsInvisible_returnFalse() { - when(mContext.getResources()).thenReturn(mResources); - when(mResources.getBoolean(R.bool.config_show_sim_info)) - .thenReturn(false); - - assertThat(SubscriptionUtil.isSimHardwareVisible(mContext)).isFalse(); - } - - @Test - public void isSimHardwareVisible_configAsVisible_returnTrue() { - when(mContext.getResources()).thenReturn(mResources); - when(mResources.getBoolean(R.bool.config_show_sim_info)) - .thenReturn(true); - - assertTrue(SubscriptionUtil.isSimHardwareVisible(mContext)); - } }