From 573495bdeb986b33035145ac00df00e20b2b98aa Mon Sep 17 00:00:00 2001
From: Bo Hu <bohu@google.com>
Date: Wed, 25 Aug 2021 22:22:20 +0000
Subject: [PATCH] Refix "emulator: disable setting NR as network type"

original cl fe4b1d85fa9bd5c0542bde876577be0893d998c8
does not fix the issue

Bug: 193418404
Bug: 197422016

Change-Id: I683b3d3057bcefc14a91ecbbd2e76700cc9c2872
---
 apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
index 365ecfed2..2f7b3e0c4 100644
--- a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
+++ b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
@@ -91,8 +91,6 @@ public class DefaultActivity extends Activity {
             // the following blocks, TODO: find out why and fix it. disable this for now.
             // TelephonyManager mTelephony = getApplicationContext().getSystemService(TelephonyManager.class);
             // mTelephony.setPreferredNetworkTypeBitmask(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
-            TelephonyManager mTelephony = getApplicationContext().getSystemService(TelephonyManager.class);
-            mTelephony.setPreferredNetworkTypeBitmask(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
             if ("freeform".equals(displaySettingsName)) {
                 Settings.Global.putInt(getContentResolver(), "sf", 1);
                 Settings.Global.putString(getContentResolver(), Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, "1");