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

Commit c5e1bae0 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am 899858a3: am 6608bd0d: am 86ed86d2: Merge change I0f73439a into eclair 

Merge commit '899858a39647803c0cb506d2320fdaf2e4d3b8b9'

* commit '899858a39647803c0cb506d2320fdaf2e4d3b8b9':
  Partially fix bug 2111240 Detect docking / undocking event by reporting
parents 8bb47226 5740d1a4

include/media/AudioSystem.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -282,6 +282,7 @@ public: 
        FORCE_BT_SCO,

        FORCE_BT_SCO,

        FORCE_BT_A2DP,

        FORCE_BT_A2DP,

        FORCE_WIRED_ACCESSORY,

        FORCE_WIRED_ACCESSORY,

        FORCE_BT_DOCK,

        NUM_FORCE_CONFIG,

        NUM_FORCE_CONFIG,

        FORCE_DEFAULT = FORCE_NONE

        FORCE_DEFAULT = FORCE_NONE

    };

    };
@@ -291,6 +292,7 @@ public: 
        FOR_COMMUNICATION,

        FOR_COMMUNICATION,

        FOR_MEDIA,

        FOR_MEDIA,

        FOR_RECORD,

        FOR_RECORD,

        FOR_DOCK,

        NUM_FORCE_USE

        NUM_FORCE_USE

    };

    };