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

Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev

Browse Source 
am: 4685c785b9

Change-Id: I1ce1afeee9ab139ff47a1deec14d536c8c9529ad
This commit is contained in:
Antony Sargent
2019-07-31 16:04:54 -07:00
committed by android-build-merger
parent f580528464 4685c785b9
commit e744ee1295
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/mobile_network_list.xml
View File

@@ -20,9 +20,11 @@
android:key="mobile_network_list_screen" android:key="mobile_network_list_screen"
android:title="@string/network_settings_title"> android:title="@string/network_settings_title">
<Preference <com.android.settingslib.RestrictedPreference
android:key="add_more" android:key="add_more"
settings:isPreferenceVisible="false" settings:isPreferenceVisible="false"
settings:userRestriction="no_config_mobile_networks"
settings:useAdminDisabledSummary="true"
android:title="@string/mobile_network_list_add_more" android:title="@string/mobile_network_list_add_more"
android:icon="@drawable/ic_menu_add_activated_tint" android:icon="@drawable/ic_menu_add_activated_tint"
android:order="100" > android:order="100" >
@@ -30,6 +32,6 @@
<extra android:name="android.telephony.euicc.extra.FORCE_PROVISION" <extra android:name="android.telephony.euicc.extra.FORCE_PROVISION"
android:value="true"/> android:value="true"/>
</intent> </intent>
</Preference> </com.android.settingslib.RestrictedPreference>
</PreferenceScreen> </PreferenceScreen>

2
src/com/android/settings/network/MobileNetworkSummaryController.java
View File

@@ -130,7 +130,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController
} }
private void update() { private void update() {
if (mPreference == null) { if (mPreference == null || mPreference.isDisabledByAdmin()) {
return; return;
} }
refreshSummary(mPreference); refreshSummary(mPreference);

9
tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java
View File

@@ -42,6 +42,7 @@ import android.text.TextUtils;
import com.android.settings.network.telephony.MobileNetworkActivity; import com.android.settings.network.telephony.MobileNetworkActivity;
import com.android.settings.widget.AddPreference; import com.android.settings.widget.AddPreference;
import com.android.settingslib.RestrictedLockUtils;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@@ -373,4 +374,12 @@ public class MobileNetworkSummaryControllerTest {
verify(mPreference, atLeastOnce()).setAddWidgetEnabled(captor.capture()); verify(mPreference, atLeastOnce()).setAddWidgetEnabled(captor.capture());
assertThat(captor.getValue()).isTrue(); assertThat(captor.getValue()).isTrue();
} }
@Test
public void onResume_disabledByAdmin_prefStaysDisabled() {
mPreference.setDisabledByAdmin(new RestrictedLockUtils.EnforcedAdmin());
mController.displayPreference(mPreferenceScreen);
mController.onResume();
verify(mPreference, never()).setEnabled(eq(true));
}
} }