Merge "emulator: disable setting NR as network type" into sc-dev-plus-aosp am: 09f16a3e3f

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15672033

Change-Id: If4a6e5ac5db66d0811ac5895bd793f340c7a6001
This commit is contained in:
Android Build Prod User
2021-08-25 22:20:23 +00:00
committed by Automerger Merge Worker

View File

@@ -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)) {