From b3fbf9dbe8d41d91efbac2118b676af74592257b Mon Sep 17 00:00:00 2001 From: Jinsuk Kim Date: Fri, 12 Sep 2014 10:41:40 +0900 Subject: Replace the MHL register name 'scratchpad' with 'vendor' Bug: 17479050 Change-Id: If6fe2949d17ad2d407df5b797c1915eb0e9bf421 --- .../android/server/hdmi/HdmiControlService.java | 41 +++++++++++----------- .../android/server/hdmi/HdmiMhlControllerStub.java | 2 +- 2 files changed, 21 insertions(+), 22 deletions(-) (limited to 'services/core/java/com/android/server/hdmi') diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 5cd7c01..3d0fd3f 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -43,7 +43,7 @@ import android.hardware.hdmi.IHdmiControlService; import android.hardware.hdmi.IHdmiDeviceEventListener; import android.hardware.hdmi.IHdmiHotplugEventListener; import android.hardware.hdmi.IHdmiInputChangeListener; -import android.hardware.hdmi.IHdmiMhlScratchpadCommandListener; +import android.hardware.hdmi.IHdmiMhlVendorCommandListener; import android.hardware.hdmi.IHdmiRecordListener; import android.hardware.hdmi.IHdmiSystemAudioModeChangeListener; import android.hardware.hdmi.IHdmiVendorCommandListener; @@ -247,10 +247,10 @@ public final class HdmiControlService extends SystemService { @GuardedBy("mLock") private boolean mMhlInputChangeEnabled; - // List of records for MHL Scratchpad command listener to handle the caller killed in action. + // List of records for MHL Vendor command listener to handle the caller killed in action. @GuardedBy("mLock") - private final ArrayList - mScratchpadCommandListenerRecords = new ArrayList<>(); + private final ArrayList + mMhlVendorCommandListenerRecords = new ArrayList<>(); @GuardedBy("mLock") private List mMhlDevices; @@ -928,16 +928,16 @@ public final class HdmiControlService extends SystemService { return mMhlDevices; } - private class HdmiMhlScratchpadCommandListenerRecord implements IBinder.DeathRecipient { - private final IHdmiMhlScratchpadCommandListener mListener; + private class HdmiMhlVendorCommandListenerRecord implements IBinder.DeathRecipient { + private final IHdmiMhlVendorCommandListener mListener; - public HdmiMhlScratchpadCommandListenerRecord(IHdmiMhlScratchpadCommandListener listener) { + public HdmiMhlVendorCommandListenerRecord(IHdmiMhlVendorCommandListener listener) { mListener = listener; } @Override public void binderDied() { - mScratchpadCommandListenerRecords.remove(this); + mMhlVendorCommandListenerRecords.remove(this); } } @@ -1403,7 +1403,7 @@ public final class HdmiControlService extends SystemService { } @Override - public void sendScratchpadCommand(final int portId, final int offset, final int length, + public void sendMhlVendorCommand(final int portId, final int offset, final int length, final byte[] data) { enforceAccessPermission(); runOnServiceThread(new Runnable() { @@ -1418,16 +1418,16 @@ public final class HdmiControlService extends SystemService { Slog.w(TAG, "Invalid port id:" + portId); return; } - mMhlController.sendScratchpadCommand(portId, offset, length, data); + mMhlController.sendVendorCommand(portId, offset, length, data); } }); } @Override - public void addHdmiMhlScratchpadCommandListener( - IHdmiMhlScratchpadCommandListener listener) { + public void addHdmiMhlVendorCommandListener( + IHdmiMhlVendorCommandListener listener) { enforceAccessPermission(); - HdmiControlService.this.addHdmiMhlScratchpadCommandListener(listener); + HdmiControlService.this.addHdmiMhlVendorCommandListener(listener); } @Override @@ -1880,9 +1880,9 @@ public final class HdmiControlService extends SystemService { } } - private void addHdmiMhlScratchpadCommandListener(IHdmiMhlScratchpadCommandListener listener) { - HdmiMhlScratchpadCommandListenerRecord record = - new HdmiMhlScratchpadCommandListenerRecord(listener); + private void addHdmiMhlVendorCommandListener(IHdmiMhlVendorCommandListener listener) { + HdmiMhlVendorCommandListenerRecord record = + new HdmiMhlVendorCommandListenerRecord(listener); try { listener.asBinder().linkToDeath(record, 0); } catch (RemoteException e) { @@ -1891,18 +1891,17 @@ public final class HdmiControlService extends SystemService { } synchronized (mLock) { - mScratchpadCommandListenerRecords.add(record); + mMhlVendorCommandListenerRecords.add(record); } } - void invokeScratchpadCommandListeners(int portId, int offest, int length, byte[] data) { + void invokeMhlVendorCommandListeners(int portId, int offest, int length, byte[] data) { synchronized (mLock) { - for (HdmiMhlScratchpadCommandListenerRecord record : - mScratchpadCommandListenerRecords) { + for (HdmiMhlVendorCommandListenerRecord record : mMhlVendorCommandListenerRecords) { try { record.mListener.onReceived(portId, offest, length, data); } catch (RemoteException e) { - Slog.e(TAG, "Failed to notify scratchpad command", e); + Slog.e(TAG, "Failed to notify MHL vendor command", e); } } } diff --git a/services/core/java/com/android/server/hdmi/HdmiMhlControllerStub.java b/services/core/java/com/android/server/hdmi/HdmiMhlControllerStub.java index c27cf18..afe6e3c 100644 --- a/services/core/java/com/android/server/hdmi/HdmiMhlControllerStub.java +++ b/services/core/java/com/android/server/hdmi/HdmiMhlControllerStub.java @@ -106,7 +106,7 @@ final class HdmiMhlControllerStub { } - void sendScratchpadCommand(int portId, int offset, int length, byte[] data) { + void sendVendorCommand(int portId, int offset, int length, byte[] data) { } void setOption(int flag, int value) { -- cgit v1.1