Merge "Fix array-related errorprone warnings" am: 159371eef5 am: 201f62aa05 am: db8f0c7c2d am: a81487ec4c am: 676d6510d2

Original change: https://android-review.googlesource.com/c/platform/development/+/2184500

Change-Id: Ic123d4dc1226e1a058736254ccf9b40a8fcc229f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

samples/ApiDemos/src/com/example/android/mmslib/pdu/PduParser.java

@@ -790,7 +790,7 @@ public class PduParser {
                         try {
                             if (LOCAL_LOGV) {
                                 Log.v(LOG_TAG, "parseHeaders: CONTENT_TYPE: " + headerField +
-                                        contentType.toString());
+                                        Arrays.toString(contentType));
                             }
                             headers.setTextString(contentType, PduHeaders.CONTENT_TYPE);
                         } catch(NullPointerException e) {

samples/WiFiDirectServiceDiscovery/src/com/example/android/wifidirect/discovery/ChatManager.java

@@ -8,6 +8,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
+import java.util.Arrays;
 
 /**
  * Handles reading and writing of messages with socket buffers. Uses a Handler
@@ -47,7 +48,7 @@ public class ChatManager implements Runnable {
                     }
 
                     // Send the obtained bytes to the UI Activity
-                    Log.d(TAG, "Rec:" + String.valueOf(buffer));
+                    Log.d(TAG, "Rec:" + Arrays.toString(buffer));
                     handler.obtainMessage(WiFiServiceDiscoveryActivity.MESSAGE_READ,
                             bytes, -1, buffer).sendToTarget();
                 } catch (IOException e) {