commit 3038e26a90688ef11667d773c7ca5438414dffc9
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 17 19:53:01 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 17 19:53:01 2022 +0000
tree 36f4a3903b46e25c5d758bf9054d586e1f01454a
parent ec8f2442a827afb8743e7dd01137ceea41a54e1b
parent 3007c94acd6ce8994ef3a7b0bde13a1e8954931f

Merge "Fix array-related errorprone warnings" am: 9ed2177318 am: 425c5c90dd am: 4deb8e8f87 am: 3007c94acd

Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2185067

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

src/com/google/android/iwlan/IwlanBroadcastReceiver.java

diff --git a/src/com/google/android/iwlan/IwlanBroadcastReceiver.java b/src/com/google/android/iwlan/IwlanBroadcastReceiver.java
index 10b10e4..e6195ba 100644
--- a/src/com/google/android/iwlan/IwlanBroadcastReceiver.java
+++ b/src/com/google/android/iwlan/IwlanBroadcastReceiver.java
@@ -29,6 +29,8 @@
 
 import com.google.android.iwlan.epdg.EpdgSelector;
 
+import java.util.Arrays;
+
 public class IwlanBroadcastReceiver extends BroadcastReceiver {
     private static final String TAG = "IwlanBroadcastReceiver";
 
@@ -96,7 +98,12 @@
                 int pcoId = intent.getIntExtra(TelephonyManager.EXTRA_PCO_ID, 0);
                 byte[] pcoData = intent.getByteArrayExtra(TelephonyManager.EXTRA_PCO_VALUE);
 
-                Log.d(TAG, "PcoID:" + String.format("0x%04x", pcoId) + " PcoData:" + pcoData);
+                Log.d(
+                        TAG,
+                        "PcoID:"
+                                + String.format("0x%04x", pcoId)
+                                + " PcoData:"
+                                + Arrays.toString(pcoData));
 
                 Context mContext = IwlanDataService.getContext();
 

src/com/google/android/iwlan/epdg/EpdgSelector.java

diff --git a/src/com/google/android/iwlan/epdg/EpdgSelector.java b/src/com/google/android/iwlan/epdg/EpdgSelector.java
index b547f38..8c859ad 100644
--- a/src/com/google/android/iwlan/epdg/EpdgSelector.java
+++ b/src/com/google/android/iwlan/epdg/EpdgSelector.java
@@ -152,7 +152,12 @@
     }
 
     public boolean setPcoData(int pcoId, byte[] pcoData) {
-        Log.d(TAG, "onReceive PcoId:" + String.format("0x%04x", pcoId) + " PcoData:" + pcoData);
+        Log.d(
+                TAG,
+                "onReceive PcoId:"
+                        + String.format("0x%04x", pcoId)
+                        + " PcoData:"
+                        + Arrays.toString(pcoData));
 
         int PCO_ID_IPV6 =
                 IwlanHelper.getConfig(