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

Commit 87a1bdc5 authored by Lalit Kansara's avatar Lalit Kansara Committed by Linux Build Service Account
Browse files

NRD56: Compilation error fix 

Compilation fix as an earlier commit did not resolve conflict properly.

Change-Id: I2317972189c5a6faa2280e4a90c7ab9dcd172f4a
parent 8acb9ebb

media/java/android/media/IAudioService.aidl

+0 −4
Original line number Diff line number Diff line
@@ -164,15 +164,11 @@ interface IAudioService { 


    oneway void unregisterRecordingCallback(in IRecordingConfigDispatcher rcdb);



<<<<<<< HEAD

    List<AudioRecordingConfiguration> getActiveRecordingConfigurations();

=======

    AudioRecordingConfiguration[] getActiveRecordingConfigurations();



    void updateRemoteControllerOnExistingMediaPlayers();



    void addMediaPlayerAndUpdateRemoteController(String packageName);



    void removeMediaPlayerAndUpdateRemoteController(String packageName);

>>>>>>> 810a57e... AVRCP 1.5 implementation

}