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

Commit d4edc6f9 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski Committed by Automerger Merge Worker
Browse files

Merge "Replace range-base loops with index-based ones." into udc-dev am: d00b03a8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22335907



Change-Id: Ib2e34fa3b0f8fd7cd1ee44a495495e11e13ba58a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41d441f2 d00b03a8

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

+8 −5
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ class InputController { 


    /* Token -> file descriptor associations. */

    @GuardedBy("mLock")

    private final Map<IBinder, InputDeviceDescriptor> mInputDeviceDescriptors = new ArrayMap<>();

    private final ArrayMap<IBinder, InputDeviceDescriptor> mInputDeviceDescriptors =

            new ArrayMap<>();



    private final Handler mHandler;

    private final NativeWrapper mNativeWrapper;
@@ -303,7 +304,8 @@ class InputController { 
    @GuardedBy("mLock")

    private void updateActivePointerDisplayIdLocked() {

        InputDeviceDescriptor mostRecentlyCreatedMouse = null;

        for (InputDeviceDescriptor otherInputDeviceDescriptor : mInputDeviceDescriptors.values()) {

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

            InputDeviceDescriptor otherInputDeviceDescriptor = mInputDeviceDescriptors.valueAt(i);

            if (otherInputDeviceDescriptor.isMouse()) {

                if (mostRecentlyCreatedMouse == null

                        || (otherInputDeviceDescriptor.getCreationOrderNumber()
@@ -338,8 +340,8 @@ class InputController { 
        }



        synchronized (mLock) {

            for (InputDeviceDescriptor value : mInputDeviceDescriptors.values()) {

                if (value.mName.equals(deviceName)) {

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

                if (mInputDeviceDescriptors.valueAt(i).mName.equals(deviceName)) {

                    throw new DeviceCreationException(

                            "Input device name already in use: " + deviceName);

                }
@@ -471,7 +473,8 @@ class InputController { 
        fout.println("    InputController: ");

        synchronized (mLock) {

            fout.println("      Active descriptors: ");

            for (InputDeviceDescriptor inputDeviceDescriptor : mInputDeviceDescriptors.values()) {

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

                InputDeviceDescriptor inputDeviceDescriptor = mInputDeviceDescriptors.valueAt(i);

                fout.println("        ptr: " + inputDeviceDescriptor.getNativePointer());

                fout.println("          displayId: " + inputDeviceDescriptor.getDisplayId());

                fout.println("          creationOrder: "