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 a0341d748..2f49586d5 100644
--- a/service/java/com/android/server/wifi/WifiApConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiApConfigStore.java
@@ -160,6 +160,10 @@ public class WifiApConfigStore {
             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();
+            }
         } catch (IOException e) {
             Log.e(TAG, "Error reading hotspot configuration " + e);
             config = null;
@@ -194,6 +198,7 @@ public class WifiApConfigStore {
             if (authType != KeyMgmt.NONE) {
                 out.writeUTF(config.preSharedKey);
             }
+            out.writeLong(config.wifiApInactivityTimeout);
         } catch (IOException e) {
             Log.e(TAG, "Error writing hotspot configuration" + e);
         }
@@ -219,6 +224,7 @@ public class WifiApConfigStore {
             //first 12 chars from xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx
             config.preSharedKey = randomUUID.substring(0, 8) + randomUUID.substring(9,13);
         }
+        config.wifiApInactivityTimeout = 0;
         return config;
     }
 }