diff options
4 files changed, 3 insertions, 14 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 22f736e367c3..f46b188882a7 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -429,10 +429,7 @@ java_aconfig_library { aconfig_declarations { name: "com.android.media.flags.bettertogether-aconfig", package: "com.android.media.flags", - srcs: [ - "media/java/android/media/flags/media_better_together.aconfig", - "media/java/android/media/flags/fade_manager_configuration.aconfig", - ], + srcs: ["media/java/android/media/flags/media_better_together.aconfig"], } java_aconfig_library { diff --git a/media/java/android/media/FadeManagerConfiguration.java b/media/java/android/media/FadeManagerConfiguration.java index 337d4b0a916c..03b63dbd4649 100644 --- a/media/java/android/media/FadeManagerConfiguration.java +++ b/media/java/android/media/FadeManagerConfiguration.java @@ -16,7 +16,7 @@ package android.media; -import static com.android.media.flags.Flags.FLAG_ENABLE_FADE_MANAGER_CONFIGURATION; +import static android.media.audiopolicy.Flags.FLAG_ENABLE_FADE_MANAGER_CONFIGURATION; import android.annotation.FlaggedApi; import android.annotation.IntDef; diff --git a/media/java/android/media/flags/fade_manager_configuration.aconfig b/media/java/android/media/flags/fade_manager_configuration.aconfig deleted file mode 100644 index 100e2235a7a8..000000000000 --- a/media/java/android/media/flags/fade_manager_configuration.aconfig +++ /dev/null @@ -1,8 +0,0 @@ -package: "com.android.media.flags" - -flag { - namespace: "media_solutions" - name: "enable_fade_manager_configuration" - description: "Enable Fade Manager Configuration support to determine fade properties" - bug: "307354764" -}
\ No newline at end of file diff --git a/media/tests/AudioPolicyTest/src/com/android/audiopolicytest/FadeManagerConfigurationUnitTest.java b/media/tests/AudioPolicyTest/src/com/android/audiopolicytest/FadeManagerConfigurationUnitTest.java index fb6bd489d5d0..f105ae9cc33e 100644 --- a/media/tests/AudioPolicyTest/src/com/android/audiopolicytest/FadeManagerConfigurationUnitTest.java +++ b/media/tests/AudioPolicyTest/src/com/android/audiopolicytest/FadeManagerConfigurationUnitTest.java @@ -16,7 +16,7 @@ package com.android.audiopolicytest; -import static com.android.media.flags.Flags.FLAG_ENABLE_FADE_MANAGER_CONFIGURATION; +import static android.media.audiopolicy.Flags.FLAG_ENABLE_FADE_MANAGER_CONFIGURATION; import static org.junit.Assert.assertThrows; |