Merge "Disable the "SIM cards" tile in new Network & internet page"

This commit is contained in:
TreeHugger Robot
2019-03-05 02:39:31 +00:00
committed by Android (Google) Code Review

View File

@@ -98,6 +98,8 @@ import androidx.preference.PreferenceGroup;
import com.android.internal.app.UnlaunchableAppActivity;
import com.android.internal.util.ArrayUtils;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.development.featureflags.FeatureFlagPersistent;
import com.android.settings.password.ChooseLockSettingsHelper;
import java.net.InetAddress;
@@ -513,6 +515,9 @@ public final class Utils extends com.android.settingslib.Utils {
* TODO: See bug 16533525.
*/
public static boolean showSimCardTile(Context context) {
if (FeatureFlagPersistent.isEnabled(context, FeatureFlags.NETWORK_INTERNET_V2)) {
return false;
}
final TelephonyManager tm =
(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);