From c734c3fc010c74078b5a1452d3b190609e2c6153 Mon Sep 17 00:00:00 2001
From: Weilun Du <wdu@google.com>
Date: Mon, 30 Mar 2020 14:06:03 -0700
Subject: [PATCH] [SdkSetup] Disable Offload Tethering

Unbreak emulator system crash when WiFi tethering switch is turned
on in Settings app.

BUG: 150408099

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: I893258171c9a6aa4659c8a636f410414c0216d41
---
 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 69dc8eae9..a6337732c 100644
--- a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
+++ b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
@@ -67,6 +67,10 @@ public class DefaultActivity extends Activity {
             Settings.Secure.putInt(getContentResolver(), Settings.Secure.INSTALL_NON_MARKET_APPS, 1);
 
             Settings.Global.putInt(getContentResolver(), Settings.Global.ADB_ENABLED, 1);
+
+            // Disable offload wifi tethering
+            Settings.Global.putInt(getContentResolver(), Settings.Global.TETHER_OFFLOAD_DISABLED, 1);
+
         }
 
         // remove this activity from the package manager.