PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[Settings] configuration for hidding SIM remove UI"

Browse Source 
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
Change-Id: I5c52b841955f5be41ce861aca740147061fc7d3f
This commit is contained in:
Bonian Chen
2022-11-22 09:51:54 +00:00
parent 8e98f5a852
commit 3b7d0d2e17
5 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/xml/reset_dashboard_fragment.xml
View File

@@ -37,7 +37,6 @@
<Preference <Preference
android:key="erase_euicc_data" android:key="erase_euicc_data"
android:title="@string/reset_esim_title" android:title="@string/reset_esim_title"
settings:isPreferenceVisible="@bool/config_show_sim_info"
settings:controller="com.android.settings.network.EraseEuiccDataController" /> settings:controller="com.android.settings.network.EraseEuiccDataController" />
<!-- Factory reset --> <!-- Factory reset -->

11
src/com/android/settings/MainClear.java
View File

@@ -64,7 +64,6 @@ import androidx.annotation.VisibleForTesting;
import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.network.SubscriptionUtil;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.ConfirmLockPattern; import com.android.settings.password.ConfirmLockPattern;
import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -382,14 +381,6 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
mScrollView.getViewTreeObserver().addOnGlobalLayoutListener(this); 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. * Whether to show strings indicating that the eUICC will be wiped.
* *
@@ -399,7 +390,7 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
@VisibleForTesting @VisibleForTesting
boolean showWipeEuicc() { boolean showWipeEuicc() {
Context context = getContext(); Context context = getContext();
if (!showAnySubscriptionInfo(context) || !isEuiccEnabled(context)) { if (!isEuiccEnabled(context)) {
return false; return false;
} }
ContentResolver cr = context.getContentResolver(); ContentResolver cr = context.getContentResolver();

6
src/com/android/settings/ResetNetwork.java
View File

@@ -235,9 +235,6 @@ public class ResetNetwork extends InstrumentedFragment {
} }
private List<SubscriptionInfo> getActiveSubscriptionInfoList() { private List<SubscriptionInfo> getActiveSubscriptionInfoList() {
if (!SubscriptionUtil.isSimHardwareVisible(getActivity())) {
return Collections.emptyList();
}
SubscriptionManager mgr = getActivity().getSystemService(SubscriptionManager.class); SubscriptionManager mgr = getActivity().getSystemService(SubscriptionManager.class);
if (mgr == null) { if (mgr == null) {
Log.w(TAG, "No SubscriptionManager"); Log.w(TAG, "No SubscriptionManager");
@@ -267,9 +264,6 @@ public class ResetNetwork extends InstrumentedFragment {
} }
private boolean showEuiccSettings(Context context) { private boolean showEuiccSettings(Context context) {
if (!SubscriptionUtil.isSimHardwareVisible(context)) {
return false;
}
EuiccManager euiccManager = EuiccManager euiccManager =
(EuiccManager) context.getSystemService(Context.EUICC_SERVICE); (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
if (!euiccManager.isEnabled()) { if (!euiccManager.isEnabled()) {

3
src/com/android/settings/network/EraseEuiccDataController.java
View File

@@ -51,8 +51,7 @@ public class EraseEuiccDataController extends BasePreferenceController {
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return SubscriptionUtil.isSimHardwareVisible(mContext) && return mContext.getPackageManager().hasSystemFeature(
mContext.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE PackageManager.FEATURE_TELEPHONY_EUICC) ? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE; : UNSUPPORTED_ON_DEVICE;
} }

5
tests/robotests/src/com/android/settings/MainClearTest.java
View File

@@ -102,10 +102,7 @@ public class MainClearTest {
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mMainClear = spy(new MainClear() { mMainClear = spy(new MainClear());
@Override
boolean showAnySubscriptionInfo(Context context) { return true; }
});
mActivity = Robolectric.setupActivity(FragmentActivity.class); mActivity = Robolectric.setupActivity(FragmentActivity.class);
mShadowActivity = Shadows.shadowOf(mActivity); mShadowActivity = Shadows.shadowOf(mActivity);
UserManager userManager = mActivity.getSystemService(UserManager.class); UserManager userManager = mActivity.getSystemService(UserManager.class);