summaryrefslogtreecommitdiffstats
path: root/dom/media/MediaManager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dom/media/MediaManager.cpp')
-rw-r--r--dom/media/MediaManager.cpp17
1 files changed, 1 insertions, 16 deletions
diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
index 44f330e99..ba6b4cd47 100644
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -13,9 +13,6 @@
#include "nsArray.h"
#include "nsContentUtils.h"
#include "nsHashPropertyBag.h"
-#ifdef MOZ_WIDGET_GONK
-#include "nsIAudioManager.h"
-#endif
#include "nsIEventTarget.h"
#include "nsIUUIDGenerator.h"
#include "nsIScriptGlobalObject.h"
@@ -1569,7 +1566,7 @@ private:
RefPtr<MediaManager> mManager; // get ref to this when creating the runnable
};
-#if defined(ANDROID) && !defined(MOZ_WIDGET_GONK)
+#if defined(ANDROID)
class GetUserMediaRunnableWrapper : public Runnable
{
public:
@@ -3042,18 +3039,6 @@ MediaManager::Observe(nsISupports* aSubject, const char* aTopic,
}
return NS_OK;
}
-#ifdef MOZ_WIDGET_GONK
- else if (!strcmp(aTopic, "phone-state-changed")) {
- nsString state(aData);
- nsresult rv;
- uint32_t phoneState = state.ToInteger(&rv);
-
- if (NS_SUCCEEDED(rv) && phoneState == nsIAudioManager::PHONE_STATE_IN_CALL) {
- StopMediaStreams();
- }
- return NS_OK;
- }
-#endif
return NS_OK;
}