diff options
| -rw-r--r-- | wifi/java/android/net/wifi/nan/PublishConfig.java | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/nan/SubscribeConfig.java | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/nan/TlvBufferUtils.java | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/wifi/java/android/net/wifi/nan/PublishConfig.java b/wifi/java/android/net/wifi/nan/PublishConfig.java index d7cba8fcdfb3..8295484eb308 100644 --- a/wifi/java/android/net/wifi/nan/PublishConfig.java +++ b/wifi/java/android/net/wifi/nan/PublishConfig.java @@ -380,8 +380,8 @@ public class PublishConfig implements Parcelable { * {@code builder.setXXX(..).setXXX(..)}. */ public Builder setServiceSpecificInfo(@NonNull String serviceSpecificInfoStr) { - mServiceSpecificInfoLength = serviceSpecificInfoStr.length(); mServiceSpecificInfo = serviceSpecificInfoStr.getBytes(); + mServiceSpecificInfoLength = mServiceSpecificInfo.length; return this; } diff --git a/wifi/java/android/net/wifi/nan/SubscribeConfig.java b/wifi/java/android/net/wifi/nan/SubscribeConfig.java index 847c8d002abb..6ef4dfa40fa8 100644 --- a/wifi/java/android/net/wifi/nan/SubscribeConfig.java +++ b/wifi/java/android/net/wifi/nan/SubscribeConfig.java @@ -413,8 +413,8 @@ public class SubscribeConfig implements Parcelable { * {@code builder.setXXX(..).setXXX(..)}. */ public Builder setServiceSpecificInfo(@NonNull String serviceSpecificInfoStr) { - mServiceSpecificInfoLength = serviceSpecificInfoStr.length(); mServiceSpecificInfo = serviceSpecificInfoStr.getBytes(); + mServiceSpecificInfoLength = mServiceSpecificInfo.length; return this; } diff --git a/wifi/java/android/net/wifi/nan/TlvBufferUtils.java b/wifi/java/android/net/wifi/nan/TlvBufferUtils.java index ea8785a858ee..fa1dcf152668 100644 --- a/wifi/java/android/net/wifi/nan/TlvBufferUtils.java +++ b/wifi/java/android/net/wifi/nan/TlvBufferUtils.java @@ -224,7 +224,8 @@ public class TlvBufferUtils { * {@code ctr.putXXX(..).putXXX(..)}. */ public TlvConstructor putString(int type, String data) { - return putByteArray(type, data.getBytes(), 0, data.length()); + byte[] bytes = data.getBytes(); + return putByteArray(type, bytes, 0, bytes.length); } /** |