Merge "Add two apis for one touch record." into lmp-dev

3 files changed, 40 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/hdmi/Constants.java b/services/core/java/com/android/server/hdmi/Constants.java
index 384cd4a..85c7747 100644
--- a/services/core/java/com/android/server/hdmi/Constants.java
+++ b/services/core/java/com/android/server/hdmi/Constants.java
@@ -206,5 +206,10 @@ final class Constants {
     static final String PROPERTY_PREFERRED_ADDRESS_PLAYBACK = "hdmi_cec.prefaddr.playback";
     static final String PROPERTY_PREFERRED_ADDRESS_TV = "hdmi_cec.prefaddr.tv";
 
+    static final int RECORDING_TYPE_DIGITAL_RF = 1;
+    static final int RECORDING_TYPE_ANALOGUE_RF = 2;
+    static final int RECORDING_TYPE_EXTERNAL_PHYSICAL_ADDRESS = 3;
+    static final int RECORDING_TYPE_OWN_SOURCE = 4;
+
     private Constants() { /* cannot be instantiated */ }
 }
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index 0239c83..560ee84 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -32,6 +32,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.IHdmiRecordRequestListener;
 import android.hardware.hdmi.IHdmiSystemAudioModeChangeListener;
 import android.hardware.hdmi.IHdmiVendorCommandListener;
 import android.media.AudioManager;
@@ -1010,6 +1011,16 @@ public final class HdmiControlService extends SystemService {
                 }
             });
          }
+
+        @Override
+        public void setRecordRequestListener(IHdmiRecordRequestListener listener) {
+            // TODO: implement this.
+        }
+
+        @Override
+        public void startRecord(int recorderAddress, byte[] recordSource) {
+            // TODO: implement this.
+        }
     }
 
     @ServiceThreadOnly
diff --git a/services/core/java/com/android/server/hdmi/OneTouchRecordAction.java b/services/core/java/com/android/server/hdmi/OneTouchRecordAction.java
index 7646027..51aa984 100644
--- a/services/core/java/com/android/server/hdmi/OneTouchRecordAction.java
+++ b/services/core/java/com/android/server/hdmi/OneTouchRecordAction.java
@@ -16,16 +16,23 @@
 
 package com.android.server.hdmi;
 
+import static com.android.server.hdmi.Constants.RECORDING_TYPE_ANALOGUE_RF;
+import static com.android.server.hdmi.Constants.RECORDING_TYPE_DIGITAL_RF;
+import static com.android.server.hdmi.Constants.RECORDING_TYPE_EXTERNAL_PHYSICAL_ADDRESS;
+import static com.android.server.hdmi.Constants.RECORDING_TYPE_OWN_SOURCE;
+
 /**
- * Feature action that performs one touch record.
- * This class only provides a skeleton of one touch play and has no detail implementaion.
+ * Feature action that performs one touch record. This class only provides a skeleton of one touch
+ * play and has no detail implementation.
  */
 public class OneTouchRecordAction extends FeatureAction {
     private final int mRecorderAddress;
+    private final int mRecordingType;
 
-    OneTouchRecordAction(HdmiCecLocalDevice source, int recorderAddress) {
+    OneTouchRecordAction(HdmiCecLocalDevice source, int recorderAddress, int recordingType) {
         super(source);
         mRecorderAddress = recorderAddress;
+        mRecordingType = recordingType;
     }
 
     @Override
@@ -33,6 +40,20 @@ public class OneTouchRecordAction extends FeatureAction {
         return false;
     }
 
+    private void sendRecordOn(int recordingType) {
+        switch (recordingType) {
+            case RECORDING_TYPE_DIGITAL_RF:
+                break;
+            case RECORDING_TYPE_ANALOGUE_RF:
+                break;
+            case RECORDING_TYPE_EXTERNAL_PHYSICAL_ADDRESS:
+                break;
+            case RECORDING_TYPE_OWN_SOURCE:
+                break;
+            // TODO: implement this.
+        }
+    }
+
     @Override
     boolean processCommand(HdmiCecMessage cmd) {
         return false;