commit 065da989f71dcbf974a56ed87c61c3e2d2b2a046
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jul 08 01:03:04 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jul 08 01:03:04 2021 +0000
tree a0af0866276d411ef3939b296faf6c8352a5cdd7
parent 6c234fb3d616f80d6c5a0d6b364268a90f6c0fb5
parent c9c6c19f5dce320f764db032f54d2d799a313efd

Snap for 7529640 from c9c6c19f5dce320f764db032f54d2d799a313efd to sc-release

Change-Id: Id2b9efadea00c820687c5187cfe7dac7d37997fc

apps/SdkSetup/AndroidManifest.xml

diff --git a/apps/SdkSetup/AndroidManifest.xml b/apps/SdkSetup/AndroidManifest.xml
index 66cca22..31eafce 100644
--- a/apps/SdkSetup/AndroidManifest.xml
+++ b/apps/SdkSetup/AndroidManifest.xml
@@ -28,7 +28,7 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <application>
         <activity android:name="DefaultActivity"
-                android:excludeFromRecents="true">
+                android:excludeFromRecents="true"
                 android:exported="true">
             <intent-filter android:priority="3">
                 <action android:name="android.intent.action.MAIN" />

apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java

diff --git a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
index 4d6bf6b..6dd69f9 100644
--- a/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
+++ b/apps/SdkSetup/src/com/android/sdksetup/DefaultActivity.java
@@ -48,6 +48,16 @@
 
         // Edit Settings only for Emulator
         if (Build.IS_EMULATOR) {
+            // 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.");
+            }
+
             // Set physical keyboard layout based on the system property set by emulator host.
             String layoutName = SystemProperties.get("vendor.qemu.keyboard_layout");
             String displaySettingsName = SystemProperties.get("ro.boot.qemu.display.settings.xml");
@@ -87,15 +97,6 @@
             }
         }
 
-        // 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);