commit fe83c41c1d7fd53861620655aa9cf1ca53f7cbd6
author bohu <bohu@google.com> Tue Aug 24 10:45:13 2021 -0700
committer Bo Hu <bohu@google.com> Wed Aug 25 00:12:05 2021 +0000
tree b8769be09c54bc0e123f8590999eae953083a2ce
parent 3dd4292214a7b62b41e4893db9e1d3e33e2c13fb

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

apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java

diff --git a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
index 6dd69f9..365ecfe 100644
--- a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
+++ b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
@@ -87,6 +87,10 @@
             // Disable offload wifi tethering
             Settings.Global.putInt(getContentResolver(), Settings.Global.TETHER_OFFLOAD_DISABLED, 1);
 
+            // 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);
             TelephonyManager mTelephony = getApplicationContext().getSystemService(TelephonyManager.class);
             mTelephony.setPreferredNetworkTypeBitmask(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
             if ("freeform".equals(displaySettingsName)) {