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

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

Change-Id: I5caaee260b962881d788e3705c2e35e5edf4191a
This commit is contained in:
Android Build Prod User
2021-08-26 00:14:43 +00:00
committed by Automerger Merge Worker

View File

@@ -91,8 +91,6 @@ public class DefaultActivity extends Activity {
// the following blocks, TODO: find out why and fix it. disable this for now. // the following blocks, TODO: find out why and fix it. disable this for now.
// TelephonyManager mTelephony = getApplicationContext().getSystemService(TelephonyManager.class); // TelephonyManager mTelephony = getApplicationContext().getSystemService(TelephonyManager.class);
// mTelephony.setPreferredNetworkTypeBitmask(TelephonyManager.NETWORK_TYPE_BITMASK_NR); // mTelephony.setPreferredNetworkTypeBitmask(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
TelephonyManager mTelephony = getApplicationContext().getSystemService(TelephonyManager.class);
mTelephony.setPreferredNetworkTypeBitmask(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
if ("freeform".equals(displaySettingsName)) { if ("freeform".equals(displaySettingsName)) {
Settings.Global.putInt(getContentResolver(), "sf", 1); Settings.Global.putInt(getContentResolver(), "sf", 1);
Settings.Global.putString(getContentResolver(), Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, "1"); Settings.Global.putString(getContentResolver(), Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT, "1");