Bug 882145: Mirror desktop UI changes for Android (bug 916609) r=jesup,jib
authorRandell Jesup <rjesup@jesup.org>
Mon, 16 Sep 2013 02:40:25 -0400
changeset 160225 c4bcef90cef941654ebdd87dab7cf2c7b9bcc954
parent 160224 078d8f2908794d2beac53cc10d54e5ec3e23732b
child 160226 acf80b86d630f56ba13e47dac5c8e0e6c1c3c68f
child 170313 2491ca3ff4eca3de15f728834830d7e3ee4eff97
child 177442 16f7aaba7243382709a6348fb8d938cecb89b4e4
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, jib
bugs882145, 916609
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 882145: Mirror desktop UI changes for Android (bug 916609) r=jesup,jib
mobile/android/chrome/content/WebrtcUI.js
--- a/mobile/android/chrome/content/WebrtcUI.js
+++ b/mobile/android/chrome/content/WebrtcUI.js
@@ -69,24 +69,23 @@ var WebrtcUI = {
       if (count > 1)
         msg.count = count;
     }
 
     sendMessageToJava(msg);
   },
 
   handleRequest: function handleRequest(aSubject, aTopic, aData) {
-    let { windowID: windowID, callID: callID } = JSON.parse(aData);
-
-    let contentWindow = Services.wm.getOuterWindowWithId(windowID);
-    let params = aSubject.QueryInterface(Ci.nsIMediaStreamOptions);
+    let constraints = aSubject.getConstraints();
 
     Services.wm.getMostRecentWindow(null).navigator.mozGetUserMediaDevices(
+      constraints,
       function (devices) {
-        WebrtcUI.prompt(windowID, callID, params.audio, params.video, devices);
+        WebrtcUI.prompt(aSubject.windowID, aSubject.callID, constraints.audio,
+                        constraints.video, devices);
       },
       function (error) {
         Cu.reportError(error);
       }
     );
   },
 
   getDeviceButtons: function(audioDevices, videoDevices, aCallID) {