From fe83c41c1d7fd53861620655aa9cf1ca53f7cbd6 Mon Sep 17 00:00:00 2001 From: bohu 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 --- apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java index 6dd69f9b0..365ecfed2 100644 --- a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java +++ b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java @@ -87,6 +87,10 @@ public class DefaultActivity extends Activity { // 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)) {