From cedad08727c8c75bb9167c4c84ab656e1a347b79 Mon Sep 17 00:00:00 2001 From: Weilun Du Date: Fri, 23 Apr 2021 22:53:52 -0700 Subject: [PATCH] [SdkSetup] Add open network "AndroidWifi" Instead of relying on WifiConfigStore.xml, we configure Wifi in SdkSetup to make data partition empty at build team. Bug: 185242318 Signed-off-by: Weilun Du Change-Id: I0f5d7f3a6e67414f4213f98b7f3b0b19e7cc129c --- apps/SdkSetup/AndroidManifest.xml | 1 + .../src/com/android/sdksetup/DefaultActivity.java | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/apps/SdkSetup/AndroidManifest.xml b/apps/SdkSetup/AndroidManifest.xml index 482412675..66cca2256 100644 --- a/apps/SdkSetup/AndroidManifest.xml +++ b/apps/SdkSetup/AndroidManifest.xml @@ -25,6 +25,7 @@ + diff --git a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java index 45dc58f3f..e9d3ab127 100644 --- a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java +++ b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java @@ -23,6 +23,8 @@ import android.content.pm.PackageManager; import android.hardware.input.InputManager; import android.hardware.input.KeyboardLayout; import android.location.LocationManager; +import android.net.wifi.WifiManager; +import android.net.wifi.WifiConfiguration; import android.provider.Settings; import android.os.Bundle; import android.os.RemoteException; @@ -30,6 +32,7 @@ import android.os.ServiceManager; import android.os.SystemProperties; import android.os.Build; import android.telephony.TelephonyManager; +import android.util.Log; import android.view.InputDevice; /** @@ -37,7 +40,8 @@ import android.view.InputDevice; * */ public class DefaultActivity extends Activity { - + private static final String TAG = "SdkSetup"; + private static final int ADD_NETWORK_FAIL = -1; @Override protected void onCreate(Bundle icicle) { super.onCreate(icicle); @@ -76,6 +80,15 @@ public class DefaultActivity extends Activity { mTelephony.setPreferredNetworkTypeBitmask(TelephonyManager.NETWORK_TYPE_BITMASK_NR); } + // Add network with SSID "AndroidWifi" + WifiConfiguration config = new WifiConfiguration(); + config.SSID = "\"AndroidWifi\""; + config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OPEN); + WifiManager mWifiManager = getApplicationContext().getSystemService(WifiManager.class); + int netId = mWifiManager.addNetwork(config); + if (netId == ADD_NETWORK_FAIL || mWifiManager.enableNetwork(netId, true)) { + Log.e(TAG, "Unable to add Wi-Fi network AndroidWifi."); + } // remove this activity from the package manager. PackageManager pm = getPackageManager(); ComponentName name = new ComponentName(this, DefaultActivity.class);