diff --git a/src/api-impl/android/content/IntentFilter.java b/src/api-impl/android/content/IntentFilter.java
index 99df3f3e..5c9450c1 100644
--- a/src/api-impl/android/content/IntentFilter.java
+++ b/src/api-impl/android/content/IntentFilter.java
@@ -94,4 +94,12 @@ public class IntentFilter {
 		}
 		return ret;
 	}
+
+	public final Iterator<String> schemesIterator() {
+		return dataSchemes.iterator();
+	}
+
+	public final Iterator authoritiesIterator() {
+		return null;
+	}
 }
diff --git a/src/api-impl/android/content/pm/PackageManager.java b/src/api-impl/android/content/pm/PackageManager.java
index 151323bb..85574934 100644
--- a/src/api-impl/android/content/pm/PackageManager.java
+++ b/src/api-impl/android/content/pm/PackageManager.java
@@ -1388,6 +1388,11 @@ public class PackageManager {
 	public PackageInfo getPackageInfo(String packageName, int flags) throws NameNotFoundException {
 		if (packageName.equals(Context.pkg.packageName)) {
 			return PackageParser.generatePackageInfo(Context.pkg, new int[0], flags, 0, 0, new HashSet<>(), new PackageUserState());
+		} else if (packageName.equals("atl")) {
+			PackageInfo info = new PackageInfo();
+			info.packageName = packageName;
+			info.signatures = new Signature[0];
+			return info;
 		} else {
 			throw new NameNotFoundException();
 		}
@@ -2241,6 +2246,18 @@ public class PackageManager {
 	 */
 	public List<ResolveInfo> queryIntentActivities(Intent intent,
 						       int flags) {
+		if ("android.intent.action.VIEW".equals(intent.getAction()) && intent.getData() != null
+		    && ("http".equals(intent.getData().getScheme()) || "https".equals(intent.getData().getScheme()))) {
+			ResolveInfo ri = new ResolveInfo();
+			ri.activityInfo.exported = true;
+			ri.activityInfo.name = "atl.browser";
+			ri.activityInfo.packageName = "atl";
+			ri.filter.addAction("android.intent.action.VIEW");
+			ri.filter.addCategory("android.intent.category.BROWSABLE");
+			ri.filter.addDataScheme("http");
+			ri.filter.addDataScheme("https");
+			return Arrays.asList(ri);
+		}
 		/* FIXME - we may need to return more than one */
 		ResolveInfo info = resolveActivity(intent, flags);
 		if (info != null)