From 95c915d9dc0e1522b8f843f63f535594359a77e8 Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Fri, 5 Apr 2019 17:21:46 -0700
Subject: [PATCH] Delete carrier entry from mobile network details page.

Followup CL will need to delete the backing code after we remove the feature flag.

Bug: 127540176
Test: robotests and visual inspection
Change-Id: I17e917b9726cf7f5470af09332ede38f8c253eed
---
 res/xml/mobile_network_settings_v2.xml                       | 5 -----
 .../settings/network/telephony/MobileNetworkSettings.java    | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/res/xml/mobile_network_settings_v2.xml b/res/xml/mobile_network_settings_v2.xml
index c3bb656bbfa..4c7de5ab9aa 100644
--- a/res/xml/mobile_network_settings_v2.xml
+++ b/res/xml/mobile_network_settings_v2.xml
@@ -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"
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 4f9f020f4d3..9659548639d 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -143,7 +143,9 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
         use(PreferredNetworkModePreferenceController.class).init(mSubId);
         use(EnabledNetworkModePreferenceController.class).init(mSubId);
         use(DataServiceSetupPreferenceController.class).init(mSubId);
-        use(EuiccPreferenceController.class).init(mSubId);
+        if (!FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2)) {
+            use(EuiccPreferenceController.class).init(mSubId);
+        }
         use(WifiCallingPreferenceController.class).init(mSubId);
 
         final OpenNetworkSelectPagePreferenceController openNetworkSelectPagePreferenceController =