commit 8685e078c95cea37a211ce921885378f5ba6839f
author Etan Cohen <etancohen@google.com> Thu Dec 07 17:17:43 2017 -0800
committer Etan Cohen <etancohen@google.com> Fri Dec 08 10:58:17 2017 -0800
tree 1c01b41a54aec47e43df3b9642df236f1aba1827
parent a1199fd809d4d45dbd49a1eb498f14ba2b541edd

[AWARE] Fix message length limit comparison

(cherry-pick of commit ff8fac8dfe2e1aae899b0953eee7b4c9b905bd52)

Bug: 70354311
Test: unit tests & integration tests
Change-Id: Idd1a8c6f25bcc8c4f097d79e711682e17ac263fd
Merged-In: I997b89493fc2102c6a0b6f4ce7a918bed39fad58

service/java/com/android/server/wifi/aware/WifiAwareServiceImpl.java

diff --git a/service/java/com/android/server/wifi/aware/WifiAwareServiceImpl.java b/service/java/com/android/server/wifi/aware/WifiAwareServiceImpl.java
index b77ae63..dd4c2e0 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareServiceImpl.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareServiceImpl.java
@@ -329,8 +329,8 @@
             enforceConnectivityInternalPermission();
         }
 
-        if (message != null
-                && message.length > mStateManager.getCharacteristics().getMaxServiceNameLength()) {
+        if (message != null && message.length
+                > mStateManager.getCharacteristics().getMaxServiceSpecificInfoLength()) {
             throw new IllegalArgumentException(
                     "Message length longer than supported by device characteristics");
         }