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

Commit 7adf99d0 authored by Marie Janssen's avatar Marie Janssen Committed by Android (Google) Code Review
Browse files

Merge "Alternate dumpsys output for arguments"

parents a66ec1ef c0f57877

src/com/android/bluetooth/btservice/AdapterService.java

+11 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import android.os.RemoteCallbackList; 
import android.os.RemoteException;

import android.os.SystemClock;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.Log;

import android.util.Pair;
@@ -2163,6 +2164,16 @@ public class AdapterService extends Service { 
    protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {

        enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);



        if (args.length > 0) {

            debugLog("dumpsys arguments, skipping normal dumpsys: " +

                    TextUtils.join(" ", args));

            if (args[0].startsWith("--proto")) {

                dumpNative(fd, args);

                // TODO(jamuraa): gather protobuf details here and merge

            }

            return;

        }



        writer.println("Bluetooth Status");

        writer.println("  enabled: " + isEnabled());

        writer.println("  state: " + getState());