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

Commit 5db107c2 authored by Raj Goparaju's avatar Raj Goparaju
Browse files

Remove fade manager aconfig from media solutions repo 

The flag was initially defined in media_solutions namespace
whereas the correct namespace is media_audio.

Move the flag to the audio repo while maintaining the same
naming convention.

This commit removes the flag definition from media scope
and updates import to audio.

Bug: 186905459
Bug: 307354764
API-Coverage-Bug: 308666800
Test: atest -c FadeManagerConfigurationUnitTest

Change-Id: I4f8701330f5e61aa5601db99f51c1b963eaed107
parent 90471152

AconfigFlags.bp

+1 −4
Original line number Diff line number Diff line
@@ -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 {

media/java/android/media/FadeManagerConfiguration.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

media/java/android/media/flags/fade_manager_configuration.aconfig

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
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

media/tests/AudioPolicyTest/src/com/android/audiopolicytest/FadeManagerConfigurationUnitTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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;