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

Commit 752f00f8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "media_solutions: Add android.media.editing.flags-aconfig flag" into...

Merge "media_solutions: Add android.media.editing.flags-aconfig flag" into main am: f189469f am: 8dddb3ce

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



Change-Id: I320d1ecff742a15de8b6951a6a7c8f679f47e079
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 223c40c1 8dddb3ce
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -680,6 +680,11 @@ java_aconfig_library {
    defaults: ["framework-minus-apex-aconfig-java-defaults"],
}

cc_aconfig_library {
    name: "com.android.media.flags.editing-aconfig-cc",
    aconfig_declarations: "com.android.media.flags.editing-aconfig",
}

// MediaProjection
aconfig_declarations {
    name: "com.android.media.flags.projection-aconfig",
+7 −0
Original line number Diff line number Diff line
@@ -8,3 +8,10 @@ flag {
  description: "Add media metrics for transcoding/editing events."
  bug: "297487694"
}

flag {
  name: "stagefrightrecorder_enable_b_frames"
  namespace: "media_solutions"
  description: "Enable B frames for Stagefright recorder."
  bug: "341121900"
}