diff options
10 files changed, 19 insertions, 13 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 3e8a51e47c9d..eb4cb919ce1b 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -2165,7 +2165,7 @@ public final class BluetoothAdapter { @Deprecated @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN) public boolean startLeScan(final UUID[] serviceUuids, final LeScanCallback callback) { - if (DBG) Log.d(TAG, "startLeScan(): " + serviceUuids); + if (DBG) Log.d(TAG, "startLeScan(): " + Arrays.toString(serviceUuids)); if (callback == null) { if (DBG) Log.e(TAG, "startLeScan: null callback"); return false; diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java index fb81fd1ea9d0..ae12c88ff233 100644 --- a/core/java/android/bluetooth/BluetoothSocket.java +++ b/core/java/android/bluetooth/BluetoothSocket.java @@ -27,6 +27,7 @@ import java.io.FileDescriptor; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.Arrays; import java.util.Locale; import java.util.UUID; import android.net.LocalSocket; @@ -234,9 +235,9 @@ public final class BluetoothSocket implements Closeable { BluetoothSocket as = new BluetoothSocket(this); as.mSocketState = SocketState.CONNECTED; FileDescriptor[] fds = mSocket.getAncillaryFileDescriptors(); - if (DBG) Log.d(TAG, "socket fd passed by stack fds: " + fds); + if (DBG) Log.d(TAG, "socket fd passed by stack fds: " + Arrays.toString(fds)); if(fds == null || fds.length != 1) { - Log.e(TAG, "socket fd passed from stack failed, fds: " + fds); + Log.e(TAG, "socket fd passed from stack failed, fds: " + Arrays.toString(fds)); as.close(); throw new IOException("bt socket acept failed"); } diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index ba9cf7c780fa..1c3f45cdbde8 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -52,6 +52,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Arrays; /** * Content providers are one of the primary building blocks of Android applications, providing @@ -1854,7 +1855,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { if (mAuthority != null) { message += mAuthority; } else { - message += mAuthorities; + message += Arrays.toString(mAuthorities); } throw new SecurityException(message); } diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 0633bff7a286..b499af597c70 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -746,7 +746,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { pw.println(prefix + "splitPublicSourceDirs=" + Arrays.toString(splitPublicSourceDirs)); } if (resourceDirs != null) { - pw.println(prefix + "resourceDirs=" + resourceDirs); + pw.println(prefix + "resourceDirs=" + Arrays.toString(resourceDirs)); } if ((flags&DUMP_FLAG_DETAILS) != 0 && seinfo != null) { pw.println(prefix + "seinfo=" + seinfo); diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 329d1b06c218..5e0734742e36 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -54,6 +54,7 @@ import android.view.ViewRootImpl; import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -2209,7 +2210,7 @@ public final class InputMethodManager { p.println(" mCurrentTextBoxAttribute: null"); } p.println(" mServedInputConnection=" + mServedInputConnection); - p.println(" mCompletions=" + mCompletions); + p.println(" mCompletions=" + Arrays.toString(mCompletions)); p.println(" mCursorRect=" + mCursorRect); p.println(" mCursorSelStart=" + mCursorSelStart + " mCursorSelEnd=" + mCursorSelEnd diff --git a/drm/java/android/drm/DrmInfo.java b/drm/java/android/drm/DrmInfo.java index 22d06c7bd20e..8c43252e95b2 100644 --- a/drm/java/android/drm/DrmInfo.java +++ b/drm/java/android/drm/DrmInfo.java @@ -17,6 +17,7 @@ package android.drm; import java.io.IOException; +import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; @@ -52,7 +53,7 @@ public class DrmInfo { if (!isValid()) { final String msg = "infoType: " + infoType + "," + "mimeType: " + mimeType + "," + - "data: " + data; + "data: " + Arrays.toString(data); throw new IllegalArgumentException(msg); } @@ -79,7 +80,7 @@ public class DrmInfo { if (!isValid()) { final String msg = "infoType: " + infoType + "," + "mimeType: " + mimeType + "," + - "data: " + mData; + "data: " + Arrays.toString(mData); throw new IllegalArgumentException(); } diff --git a/drm/java/android/drm/DrmRights.java b/drm/java/android/drm/DrmRights.java index a9b4f0575bf1..8747f777def0 100644 --- a/drm/java/android/drm/DrmRights.java +++ b/drm/java/android/drm/DrmRights.java @@ -18,6 +18,7 @@ package android.drm; import java.io.File; import java.io.IOException; +import java.util.Arrays; /** * An entity class that wraps the license information retrieved from the online DRM server. @@ -103,7 +104,7 @@ public class DrmRights { mMimeType = mimeType; if (!isValid()) { final String msg = "mimeType: " + mMimeType + "," + - "data: " + mData; + "data: " + Arrays.toString(mData); throw new IllegalArgumentException(msg); } } @@ -127,7 +128,7 @@ public class DrmRights { if (!isValid()) { final String msg = "mimeType: " + mMimeType + "," + - "data: " + mData; + "data: " + Arrays.toString(mData); throw new IllegalArgumentException(msg); } } diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java index e0a9975d61ab..7ac3c4b514d6 100644 --- a/services/core/java/com/android/server/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java @@ -189,7 +189,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe protected void handleEnumerate(long deviceId, int[] fingerIds, int[] groupIds) { if (fingerIds.length != groupIds.length) { Slog.w(TAG, "fingerIds and groupIds differ in length: f[]=" - + fingerIds + ", g[]=" + groupIds); + + Arrays.toString(fingerIds) + ", g[]=" + Arrays.toString(groupIds)); return; } if (DEBUG) Slog.w(TAG, "Enumerate: f[]=" + fingerIds + ", g[]=" + groupIds); diff --git a/services/core/java/com/android/server/location/GpsLocationProvider.java b/services/core/java/com/android/server/location/GpsLocationProvider.java index bc9f5205e1c5..88ab2c65e979 100644 --- a/services/core/java/com/android/server/location/GpsLocationProvider.java +++ b/services/core/java/com/android/server/location/GpsLocationProvider.java @@ -88,6 +88,7 @@ import java.io.PrintWriter; import java.io.StringReader; import java.net.InetAddress; import java.net.UnknownHostException; +import java.util.Arrays; import java.util.Date; import java.util.Map.Entry; import java.util.Properties; @@ -1599,7 +1600,7 @@ public class GpsLocationProvider implements LocationProviderInterface { switch (status) { case GPS_REQUEST_AGPS_DATA_CONN: if (DEBUG) Log.d(TAG, "GPS_REQUEST_AGPS_DATA_CONN"); - Log.v(TAG, "Received SUPL IP addr[]: " + ipaddr); + Log.v(TAG, "Received SUPL IP addr[]: " + Arrays.toString(ipaddr)); InetAddress connectionIpAddress = null; if (ipaddr != null) { try { diff --git a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceResponse.java b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceResponse.java index 0ddfa77e33ec..a0b5a6e6bad9 100644 --- a/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceResponse.java +++ b/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceResponse.java @@ -296,7 +296,7 @@ public class WifiP2pServiceResponse implements Parcelable { sbuf.append("serviceType:").append(mServiceType); sbuf.append(" status:").append(Status.toString(mStatus)); sbuf.append(" srcAddr:").append(mDevice.deviceAddress); - sbuf.append(" data:").append(mData); + sbuf.append(" data:").append(Arrays.toString(mData)); return sbuf.toString(); } |