diff options
| author | Yuncheol Heo <ycheo@google.com> | 2014-05-20 22:53:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-20 22:53:13 +0000 |
| commit | cd47ecb6903edb57f4a2ec52ecd33d4346ba13e9 (patch) | |
| tree | d5d460443d1bfc8a7a8abc1639eb958726908c7a | |
| parent | 863ddcc7acef56eaf49f424586d83543c6ba2bbf (diff) | |
| parent | 03e8a834da8189b3a20023cee31e78a17a45b07b (diff) | |
| download | frameworks_base-cd47ecb6903edb57f4a2ec52ecd33d4346ba13e9.zip frameworks_base-cd47ecb6903edb57f4a2ec52ecd33d4346ba13e9.tar.gz frameworks_base-cd47ecb6903edb57f4a2ec52ecd33d4346ba13e9.tar.bz2 | |
Merge "Fix the wrong conversion of byte to int."
| -rw-r--r-- | services/core/java/com/android/server/hdmi/NewDeviceAction.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/hdmi/NewDeviceAction.java b/services/core/java/com/android/server/hdmi/NewDeviceAction.java index e0bc718..156bbbe 100644 --- a/services/core/java/com/android/server/hdmi/NewDeviceAction.java +++ b/services/core/java/com/android/server/hdmi/NewDeviceAction.java @@ -103,7 +103,7 @@ final class NewDeviceAction extends FeatureAction { requestVendorId(); return true; } else if (opcode == HdmiCec.MESSAGE_FEATURE_ABORT) { - int requestOpcode = params[1]; + int requestOpcode = params[1] & 0xff; if (requestOpcode == HdmiCec.MESSAGE_SET_OSD_NAME) { mState = STATE_WAITING_FOR_DEVICE_VENDOR_ID; requestVendorId(); @@ -113,7 +113,8 @@ final class NewDeviceAction extends FeatureAction { } else if (mState == STATE_WAITING_FOR_DEVICE_VENDOR_ID) { if (opcode == HdmiCec.MESSAGE_DEVICE_VENDOR_ID) { if (params.length == 3) { - mVendorId = (params[0] << 16) + (params[1] << 8) + params[2]; + mVendorId = ((params[0] & 0xff) << 16) + ((params[1] & 0xff) << 8) + + (params[2] & 0xff); } else { Slog.e(TAG, "Failed to get device vendor ID: "); } @@ -121,7 +122,7 @@ final class NewDeviceAction extends FeatureAction { finish(); return true; } else if (opcode == HdmiCec.MESSAGE_FEATURE_ABORT) { - int requestOpcode = params[1]; + int requestOpcode = params[1] & 0xff; if (requestOpcode == HdmiCec.MESSAGE_DEVICE_VENDOR_ID) { addDeviceInfo(); finish(); |