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

Merge "Delete carrier entry from mobile network details page." into qt-dev

Browse Source 
am: b93761d252

Change-Id: Iba51501adb7106d1ca6b0fbf4327bc94c9e58c41
This commit is contained in:
Andrew Sapperstein
2019-04-08 14:04:11 -07:00
committed by android-build-merger
parent da62a42ef8 b93761d252
commit 4bbd1e867b
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/mobile_network_settings_v2.xml
View File

@@ -93,11 +93,6 @@
android:dialogTitle="@string/preferred_network_mode_dialogtitle"
settings:controller="com.android.settings.network.telephony.EnabledNetworkModePreferenceController"/>
<Preference
android:key="carrier_settings_euicc_key"
android:title="@string/carrier_settings_euicc"
settings:controller="com.android.settings.network.telephony.EuiccPreferenceController" />
<Preference
android:key="carrier_settings_version_key"
android:title="@string/carrier_settings_version"

2
src/com/android/settings/network/telephony/MobileNetworkSettings.java
View File

@@ -143,7 +143,9 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
use(PreferredNetworkModePreferenceController.class).init(mSubId);
use(EnabledNetworkModePreferenceController.class).init(mSubId);
use(DataServiceSetupPreferenceController.class).init(mSubId);
if (!FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2)) {
use(EuiccPreferenceController.class).init(mSubId);
}
use(WifiCallingPreferenceController.class).init(mSubId);
final OpenNetworkSelectPagePreferenceController openNetworkSelectPagePreferenceController =