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

Commit 70c73210 authored by Marie Janssen's avatar Marie Janssen Committed by android-build-merger
Browse files

Merge "Don't print dumpsys info twice in bugreport" am: d65bac68 am: 60012c1d am: 16bd26b3

am: 9e7db8d9

Change-Id: I854751cbc6347e521ee523e1462183201cdfe07f
parents 37ce5a4e 9e7db8d9
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -2556,6 +2556,12 @@ public class AdapterService extends Service {
    protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
        enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);

        if (args.length == 0) {
            writer.println("Skipping dump in APP SERVICES, see bluetooth_manager section.");
            writer.println("Use --print argument for dumpsys direct from AdapterService.");
            return;
        }

        if (args.length > 0) {
            verboseLog("dumpsys arguments, check for protobuf output: "
                       + TextUtils.join(" ", args));