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

Commit f1492cdf authored by Paul Colta's avatar Paul Colta Committed by Automerger Merge Worker
Browse files

Merge changes Ie017bedf,If29d58fa into main am: 850c5384 

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



Change-Id: I3fc52a5359f0bd0c637dbc29edc8d36192282587
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb55fc8e 850c5384

services/core/java/com/android/server/hdmi/HdmiCecController.java

+10 −6
Original line number Diff line number Diff line
@@ -1207,9 +1207,11 @@ final class HdmiCecController { 


        @Override

        public void onValues(int result, short addr) {

            if (result == Result.SUCCESS) {

            synchronized (mLock) {

                    mPhysicalAddress = new Short(addr).intValue();

                if (result == Result.SUCCESS) {

                    mPhysicalAddress = Short.toUnsignedInt(addr);

                } else {

                    mPhysicalAddress = INVALID_PHYSICAL_ADDRESS;

                }

            }

        }
@@ -1605,9 +1607,11 @@ final class HdmiCecController { 


        @Override

        public void onValues(int result, short addr) {

            if (result == Result.SUCCESS) {

            synchronized (mLock) {

                    mPhysicalAddress = new Short(addr).intValue();

                if (result == Result.SUCCESS) {

                    mPhysicalAddress = Short.toUnsignedInt(addr);

                } else {

                    mPhysicalAddress = INVALID_PHYSICAL_ADDRESS;

                }

            }

        }