From 136600a181d6ce6f425b5e7fd5e6cc480685c41d Mon Sep 17 00:00:00 2001
From: bohu <bohu@google.com>
Date: Tue, 24 Aug 2021 10:45:13 -0700
Subject: [PATCH] emulator: disable setting NR as network type

It appears to be blocking and prevents sdksetup app from
responding.

Disable it for now.

Bug: 193418404
Bug: 197422016
Change-Id: I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c
Merged-In: I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c
---
 .../SdkSetup/src/com/android/sdksetup/DefaultActivity.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
index 457f4a769..15b5fb5b6 100644
--- a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
+++ b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
@@ -86,8 +86,11 @@ public class DefaultActivity extends Activity {
             // Disable offload wifi tethering
             Settings.Global.putInt(getContentResolver(), Settings.Global.TETHER_OFFLOAD_DISABLED, 1);
 
-            TelephonyManager mTelephony = getApplicationContext().getSystemService(TelephonyManager.class);
-            mTelephony.setPreferredNetworkTypeBitmask(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
+            // b/193418404
+            // 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);
+
         }
 
         // remove this activity from the package manager.