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

Commit 65e60b26 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Android (Google) Code Review
Browse files

Merge "Add toString overrides to all virtual input objects. -... 

Merge "Add toString overrides to all virtual input objects.  - VirtualInputDevice and all the relevant subclasses  - VirtualInputDeviceConfig and all the relevant subclasses  - All Virtual*Event" into main
parents 5a6c698f f27af716

core/java/android/companion/virtual/VirtualDeviceInternal.java

+5 −5
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ public class VirtualDeviceInternal { 
            final IBinder token = new Binder(

                    "android.hardware.input.VirtualDpad:" + config.getInputDeviceName());

            mVirtualDevice.createVirtualDpad(config, token);

            return new VirtualDpad(mVirtualDevice, token);

            return new VirtualDpad(config, mVirtualDevice, token);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -283,7 +283,7 @@ public class VirtualDeviceInternal { 
            final IBinder token = new Binder(

                    "android.hardware.input.VirtualKeyboard:" + config.getInputDeviceName());

            mVirtualDevice.createVirtualKeyboard(config, token);

            return new VirtualKeyboard(mVirtualDevice, token);

            return new VirtualKeyboard(config, mVirtualDevice, token);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -295,7 +295,7 @@ public class VirtualDeviceInternal { 
            final IBinder token = new Binder(

                    "android.hardware.input.VirtualMouse:" + config.getInputDeviceName());

            mVirtualDevice.createVirtualMouse(config, token);

            return new VirtualMouse(mVirtualDevice, token);

            return new VirtualMouse(config, mVirtualDevice, token);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -308,7 +308,7 @@ public class VirtualDeviceInternal { 
            final IBinder token = new Binder(

                    "android.hardware.input.VirtualTouchscreen:" + config.getInputDeviceName());

            mVirtualDevice.createVirtualTouchscreen(config, token);

            return new VirtualTouchscreen(mVirtualDevice, token);

            return new VirtualTouchscreen(config, mVirtualDevice, token);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }
@@ -322,7 +322,7 @@ public class VirtualDeviceInternal { 
                    "android.hardware.input.VirtualNavigationTouchpad:"

                            + config.getInputDeviceName());

            mVirtualDevice.createVirtualNavigationTouchpad(config, token);

            return new VirtualNavigationTouchpad(mVirtualDevice, token);

            return new VirtualNavigationTouchpad(config, mVirtualDevice, token);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/android/hardware/input/VirtualDpad.java

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ public class VirtualDpad extends VirtualInputDevice { 
                                    KeyEvent.KEYCODE_DPAD_CENTER)));



    /** @hide */

    public VirtualDpad(IVirtualDevice virtualDevice, IBinder token) {

        super(virtualDevice, token);

    public VirtualDpad(VirtualDpadConfig config, IVirtualDevice virtualDevice, IBinder token) {

        super(config, virtualDevice, token);

    }



    /**

core/java/android/hardware/input/VirtualInputDevice.java

+9 −1
Original line number Diff line number Diff line
@@ -42,9 +42,12 @@ abstract class VirtualInputDevice implements Closeable { 
     */

    protected final IBinder mToken;



    protected final VirtualInputDeviceConfig mConfig;



    /** @hide */

    VirtualInputDevice(

    VirtualInputDevice(VirtualInputDeviceConfig config,

            IVirtualDevice virtualDevice, IBinder token) {

        mConfig = config;

        mVirtualDevice = virtualDevice;

        mToken = token;

    }
@@ -70,4 +73,9 @@ abstract class VirtualInputDevice implements Closeable { 
            throw e.rethrowFromSystemServer();

        }

    }



    @Override

    public String toString() {

        return mConfig.toString();

    }

}

core/java/android/hardware/input/VirtualInputDeviceConfig.java

+16 −0
Original line number Diff line number Diff line
@@ -91,6 +91,22 @@ public abstract class VirtualInputDeviceConfig { 
        dest.writeString8(mInputDeviceName);

    }



    @Override

    public String toString() {

        return getClass().getName() + "( "

                + " name=" + mInputDeviceName

                + " vendorId=" + mVendorId

                + " productId=" + mProductId

                + " associatedDisplayId=" + mAssociatedDisplayId

                + additionalFieldsToString() + ")";

    }



    /** @hide */

    @NonNull

    String additionalFieldsToString() {

        return "";

    }



    /**

     * A builder for {@link VirtualInputDeviceConfig}

     *

core/java/android/hardware/input/VirtualKeyEvent.java

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

    }



    @Override

    public String toString() {

        return "VirtualKeyEvent("

                + " action=" + KeyEvent.actionToString(mAction)

                + " keyCode=" + KeyEvent.keyCodeToString(mKeyCode)

                + " eventTime(ns)=" + mEventTimeNanos;

    }



    /**

     * Returns the key code associated with this event.

     */