Skip to content

Commit 4b723c5

Browse files
Treehugger Robotandroid-build-merge-worker-robot
Treehugger Robot
authored andcommitted
Merge "media_solutions: Add android.media.editing.flags-aconfig flag" into main am: b01f207 am: c733238
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3256507 Change-Id: I320d1ecff742a15de8b6951a6a7c8f679f47e079 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 parents 37c1349 + c733238 commit 4b723c5

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

AconfigFlags.bp

+5
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,11 @@ java_aconfig_library {
680680
defaults: ["framework-minus-apex-aconfig-java-defaults"],
681681
}
682682

683+
cc_aconfig_library {
684+
name: "com.android.media.flags.editing-aconfig-cc",
685+
aconfig_declarations: "com.android.media.flags.editing-aconfig",
686+
}
687+
683688
// MediaProjection
684689
aconfig_declarations {
685690
name: "com.android.media.flags.projection-aconfig",

media/java/android/media/flags/editing.aconfig

+7
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,10 @@ flag {
88
description: "Add media metrics for transcoding/editing events."
99
bug: "297487694"
1010
}
11+
12+
flag {
13+
name: "stagefrightrecorder_enable_b_frames"
14+
namespace: "media_solutions"
15+
description: "Enable B frames for Stagefright recorder."
16+
bug: "341121900"
17+
}

0 commit comments

Comments
 (0)