Handle open URL intent on Android

1 files changed, 7 insertions, 2 deletions

diff --git a/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java b/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
index 430bb39ec2e..04012ecd0e6 100644
--- a/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
+++ b/support/android/apk/servoapp/src/main/java/org/mozilla/servo/MainActivity.java
@@ -7,6 +7,7 @@ package org.mozilla.servo;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.system.ErrnoException;
@@ -70,10 +71,14 @@ public class MainActivity extends Activity implements Servo.Client {
           }
         }
 
-        String args = getIntent().getStringExtra("servoargs");
-        String log = getIntent().getStringExtra("servolog");
+        Intent intent = getIntent();
+        String args = intent.getStringExtra("servoargs");
+        String log = intent.getStringExtra("servolog");
         mServoView.setServoArgs(args, log);
 
+        if (Intent.ACTION_VIEW.equals(intent.getAction())) {
+          mServoView.loadUri(intent.getData());
+        }
         setupUrlField();
     }