summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Kuhne <kuh@google.com>2017-05-03 07:17:02 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-03 07:17:02 +0000
commit74196d24e936be52b75f5b3e3ceecda0fa12bfdd (patch)
tree15145b699f815411c2ac3f37d6418d9f43fbcdd6
parentba2ed785e496402c48b534ba6480eb980215e302 (diff)
parent9fb23cf57d37d987be9ebc6ee6d2f7942e519375 (diff)
Merge "Use correct P2P GO intent value" am: 33d887d7bd am: 3eb6016c90 am: fbeb9fdd2b
am: 9fb23cf57d Change-Id: I5e6c8d77ef62bcbe461a403846a999aaabad17e6
-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(