summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Kuhne <kuh@google.com>2017-05-03 07:14:32 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-03 07:14:32 +0000
commit9fb23cf57d37d987be9ebc6ee6d2f7942e519375 (patch)
tree172332f5011e2f25f2ec41379795f19774bdb8c4
parent1a96bfa4c7cfb451aca65f90fa49461bcf679b4a (diff)
parentfbeb9fdd2be911646dc2e9da1a00b472f9ddb3a2 (diff)
Merge "Use correct P2P GO intent value" am: 33d887d7bd am: 3eb6016c90
am: fbeb9fdd2b Change-Id: Ie88ffaa8483af096a5c351d820c59d37591a8a71
-rw-r--r--service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java b/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java
index 6f4543edb..fe91b27d4 100644
--- a/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java
+++ b/service/java/com/android/server/wifi/p2p/SupplicantP2pIfaceHal.java
@@ -668,6 +668,7 @@ public class SupplicantP2pIfaceHal {
if (groupOwnerIntent < 0 || groupOwnerIntent > 15) {
groupOwnerIntent = DEFAULT_GROUP_OWNER_INTENT;
}
+ goIntent = groupOwnerIntent;
}
SupplicantResult<String> result = new SupplicantResult(