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

Commit b8277919 authored by David Zhao's avatar David Zhao Committed by Android (Google) Code Review
Browse files

Merge "Add new APIs for watermarking"

parents 089e8979 6bdbc5e6
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
# Bug component: 105688
hgchen@google.com
shubang@google.com
quxiangfang@google.com
+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ aidl_interface {
    imports: [
        "android.hardware.common-V2",
        "android.media.audio.common.types-V1",
        "android.hardware.common.fmq-V1",
    ],
    stability: "vintf",
    backend: {
+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ interface ITvInput {
  android.hardware.tv.input.TvStreamConfig[] getStreamConfigurations(in int deviceId);
  android.hardware.common.NativeHandle openStream(in int deviceId, in int streamId);
  void setCallback(in android.hardware.tv.input.ITvInputCallback callback);
  void setTvMessageEnabled(int deviceId, int streamId, in android.hardware.tv.input.TvMessageEventType type, boolean enabled);
  void getTvMessageQueueDesc(out android.hardware.common.fmq.MQDescriptor<byte,android.hardware.common.fmq.SynchronizedReadWrite> queue, int deviceId, int streamId);
  const int STATUS_UNKNOWN = 1;
  const int STATUS_NO_RESOURCE = 2;
  const int STATUS_INVALID_ARGUMENTS = 3;
+1 −0
Original line number Diff line number Diff line
@@ -35,4 +35,5 @@ package android.hardware.tv.input;
@VintfStability
interface ITvInputCallback {
  void notify(in android.hardware.tv.input.TvInputEvent event);
  void notifyTvMessageEvent(in android.hardware.tv.input.TvMessageEvent event);
}
+40 −0
Original line number Diff line number Diff line
/*
 * Copyright 2022 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.tv.input;
@VintfStability
parcelable TvMessage {
  String subType;
  long groupId;
  int dataLengthBytes;
}
Loading