LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix array-related errorprone warnings" am: 159371eef5 am: 201f62aa05

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

Change-Id: I460f3c7f38846bf3044c7da263202e33d0efb847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2022-08-22 23:42:05 +00:00
committed by Automerger Merge Worker
parent b5b440b045 201f62aa05
commit db8f0c7c2d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -8,6 +8,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.Socket; import java.net.Socket;
import java.util.Arrays;
/** /**
* Handles reading and writing of messages with socket buffers. Uses a Handler * 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 // 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, handler.obtainMessage(WiFiServiceDiscoveryActivity.MESSAGE_READ,
bytes, -1, buffer).sendToTarget(); bytes, -1, buffer).sendToTarget();
} catch (IOException e) { } catch (IOException e) {