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

Commit 286563ad authored by Marvin Ramin's avatar Marvin Ramin Committed by Vladimir Komsiyski
Browse files

Reduce newlines in dumpsys virtualdevice 

Bug: 417927758
Test: n/a
Flag: EXEMPT refactor
Change-Id: I79773cde75196c71476697409d56225cde610c77
parent 7713d255

core/java/android/companion/virtual/camera/VirtualCameraConfig.java

+8 −0
Original line number Diff line number Diff line
@@ -250,6 +250,14 @@ public final class VirtualCameraConfig implements Parcelable { 
        return mCameraCharacteristics;

    }



    @Override

    public String toString() {

        return "VirtualCameraConfig("

                + " name=" + mName

                + " lensFacing=" + mLensFacing

                + " sensorOrientation=" + mSensorOrientation + " )";

    }



    /**

     * Builder for {@link VirtualCameraConfig}.

     *

services/companion/java/com/android/server/companion/virtual/InputController.java

+4 −9
Original line number Diff line number Diff line
@@ -161,16 +161,11 @@ class InputController { 
        mWindowManager.setDisplayImePolicy(displayId, policy);

    }



    public void dump(@NonNull PrintWriter fout) {

        final String prefix = "    ";

        fout.println(prefix + "InputController: ");

    public void dump(@NonNull PrintWriter fout, String indent) {

        synchronized (mLock) {

            if (mInputDevices.isEmpty()) {

                fout.println(prefix + prefix + "No active input devices");

            } else {

            fout.println(indent + "InputController: " + mInputDevices.size() + " input devices");

            for (int i = 0; i < mInputDevices.size(); ++i) {

                    fout.println(prefix + prefix + mInputDevices.valueAt(i).toString());

                }

                fout.println(indent + indent + mInputDevices.valueAt(i));

            }

        }

    }

services/companion/java/com/android/server/companion/virtual/SensorController.java

+12 −6
Original line number Diff line number Diff line
@@ -218,14 +218,12 @@ public class SensorController { 
        }

    }



    void dump(@NonNull PrintWriter fout) {

        fout.println("    SensorController: ");

    void dump(@NonNull PrintWriter fout, String indent) {

        synchronized (mLock) {

            fout.println("      Active descriptors: ");

            fout.println(indent + "SensorController: " + mSensorDescriptors.size()

                    + " virtual sensors");

            for (SensorDescriptor sensorDescriptor : mSensorDescriptors.values()) {

                fout.println("        handle: " + sensorDescriptor.getHandle());

                fout.println("          type: " + sensorDescriptor.getType());

                fout.println("          name: " + sensorDescriptor.getName());

                fout.println(indent + indent + sensorDescriptor);

            }

        }

    }
@@ -374,6 +372,14 @@ public class SensorController { 
        public String getName() {

            return mName;

        }



        @Override

        public String toString() {

            return "SensorDescriptor("

                    + " name=" + mName

                    + " type=" + mType

                    + " handle=" + mHandle + " )";

        }

    }



    /** An internal exception that is thrown to indicate an error when opening a virtual sensor. */

services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java

+9 −5
Original line number Diff line number Diff line
@@ -1253,16 +1253,20 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub 
        fout.println(indent + "mOwnerPackageName: " + mOwnerPackageName);

        fout.println(indent + "mParams: ");

        mParams.dump(fout, indent + indent);

        fout.println(indent + "mVirtualDisplayIds: ");

        synchronized (mVirtualDeviceLock) {

            StringBuilder displays = new StringBuilder();

            for (int i = 0; i < mVirtualDisplays.size(); i++) {

                fout.println(indent + "  " + mVirtualDisplays.keyAt(i));

                displays.append(mVirtualDisplays.keyAt(i));

                if (i < mVirtualDisplays.size() - 1) {

                    displays.append(", ");

                }

            fout.println("    mDevicePolicies: " + mDevicePolicies);

            }

            fout.println(indent + "mVirtualDisplayIds: " + displays);

            fout.println(indent + "mDevicePolicies: " + mDevicePolicies);

            fout.println(indent + "mDefaultShowPointerIcon: " + mDefaultShowPointerIcon);

        }

        mInputController.dump(fout);

        mSensorController.dump(fout);

        mInputController.dump(fout, indent);

        mSensorController.dump(fout, indent);

        if (mVirtualCameraController != null) {

            mVirtualCameraController.dump(fout, indent);

        }

services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import android.compat.annotation.ChangeId; 
import android.compat.annotation.EnabledAfter;

import android.content.AttributionSource;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.hardware.display.DisplayManagerInternal;

import android.hardware.display.IVirtualDisplayCallback;
@@ -657,8 +656,9 @@ public class VirtualDeviceManagerService extends SystemService { 
            if (!DumpUtils.checkDumpAndUsageStatsPermission(getContext(), TAG, fout)) {

                return;

            }

            fout.println("Created virtual devices: ");

            ArrayList<VirtualDeviceImpl> virtualDevicesSnapshot = getVirtualDevicesSnapshot();

            fout.println("Number of active virtual devices: " + virtualDevicesSnapshot.size());

            fout.println("Created virtual devices: ");

            for (int i = 0; i < virtualDevicesSnapshot.size(); i++) {

                virtualDevicesSnapshot.get(i).dump(fd, fout, args);

            }