Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e37f2c6e authored by Andreas Gampe's avatar Andreas Gampe Committed by Android (Google) Code Review
Browse files

Merge "Frameworks/base: Use Arrays.toString"

parents 4b4a2529 e6748ce3

core/java/android/bluetooth/BluetoothAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/java/android/bluetooth/BluetoothSocket.java

+3 −2
Original line number Diff line number Diff line
@@ -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");

        }

core/java/android/content/ContentProvider.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

        }

core/java/android/content/pm/ApplicationInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

core/java/android/view/inputmethod/InputMethodManager.java

+2 −1
Original line number Diff line number Diff line
@@ -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