1 files changed, 6 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiApConfigStore.java b/service/java/com/android/server/wifi/WifiApConfigStore.java
index 4db0367d1..69d77f5cc 100644
--- a/service/java/com/android/server/wifi/WifiApConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiApConfigStore.java
@@ -181,6 +181,10 @@ class WifiApConfigStore extends StateMachine {
             if (authType != KeyMgmt.NONE) {
                 config.preSharedKey = in.readUTF();
             }
+            // read in wifiApInactivityTimeout if bytes are available from in
+            if (in.available() != 0) {
+                config.wifiApInactivityTimeout = in.readLong();
+            }
 
             mWifiApConfig = config;
         } catch (IOException ignore) {
@@ -213,6 +217,7 @@ class WifiApConfigStore extends StateMachine {
             if(authType != KeyMgmt.NONE) {
                 out.writeUTF(config.preSharedKey);
             }
+            out.writeLong(config.wifiApInactivityTimeout);
         } catch (IOException e) {
             Log.e(TAG, "Error writing hotspot configuration" + e);
         } finally {
@@ -249,6 +254,7 @@ class WifiApConfigStore extends StateMachine {
             config.preSharedKey = randomUUID.substring(0, 8)
                     + randomUUID.substring(9, 13);
         }
+        config.wifiApInactivityTimeout = 0;
 
         sendMessage(WifiStateMachine.CMD_SET_AP_CONFIG, config);
     }