diff options
| author | Les Lee <lesl@google.com> | 2020-03-19 02:22:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-19 02:22:00 +0000 |
| commit | e61116cf473de8befe18114be0533708333d89aa (patch) | |
| tree | 8ca21de4744cdacf950af4b94eb74b20d2e301b1 | |
| parent | c5a7be7a8ff56a03a1bc15ae0b15dd8ad1091cca (diff) | |
| parent | 81b0ea6fc569ad87282f8a621e956d79e162923f (diff) | |
Merge "wifi: LocalOnlyHotspot should not enable softap client timeout" into rvc-dev
| -rw-r--r-- | service/java/com/android/server/wifi/WifiApConfigStore.java | 2 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiApConfigStore.java b/service/java/com/android/server/wifi/WifiApConfigStore.java index df901a321..b8d1d3b41 100644 --- a/service/java/com/android/server/wifi/WifiApConfigStore.java +++ b/service/java/com/android/server/wifi/WifiApConfigStore.java @@ -263,6 +263,8 @@ public class WifiApConfigStore { configBuilder = new SoftApConfiguration.Builder(customConfig); } else { configBuilder = new SoftApConfiguration.Builder(); + // Default to disable the auto shutdown + configBuilder.setAutoShutdownEnabled(false); } configBuilder.setBand(apBand); diff --git a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java index 54761e2be..4aacb1d78 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java @@ -199,6 +199,7 @@ public class WifiApConfigStoreTest extends WifiBaseTest { assertEquals(SECURITY_TYPE_WPA2_PSK, config.getSecurityType()); } assertEquals(15, config.getPassphrase().length()); + assertFalse(config.isAutoShutdownEnabled()); } private void verifyDefaultLocalOnlyApConfig(SoftApConfiguration config, String expectedSsid, |