From 9273cefb95965e70f053d604d163659c1211b36b Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Tue, 15 Oct 2013 10:32:39 -0700
Subject: [PATCH] Bug 807313 - Allow showing app icons in native ui using
 -moz-icon protocols. r=mfinkle

---
 mobile/android/base/gfx/BitmapUtils.java | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/mobile/android/base/gfx/BitmapUtils.java b/mobile/android/base/gfx/BitmapUtils.java
index a8d0cdd4f5ce..53c4f1b6bd23 100644
--- a/mobile/android/base/gfx/BitmapUtils.java
+++ b/mobile/android/base/gfx/BitmapUtils.java
@@ -82,6 +82,19 @@ public final class BitmapUtils {
             return;
         }
 
+        if(data.startsWith("-moz-icon://")) {
+            Uri imageUri = Uri.parse(data);
+            String resource = imageUri.getSchemeSpecificPart();
+            resource = resource.substring(resource.lastIndexOf('/') + 1);
+
+            try {
+                Drawable d = context.getPackageManager().getApplicationIcon(resource);
+                loader.onBitmapFound(d);
+            } catch(Exception ex) { }
+
+            return;
+        }
+
         if(data.startsWith("drawable://")) {
             Uri imageUri = Uri.parse(data);
             int id = getResource(imageUri, R.drawable.ic_status_logo);