Bug 902899 - Fix ContentPermission Prompt. r=etienne

b2g/chrome/content/shell.js

@@ -791,6 +791,7 @@ var AlertsHelper = {
 
     if (!manifestUrl || !manifestUrl.length) {
       send(null, null);
+      return;
     }
 
     // If we have a manifest URL, get the icon and title from the manifest

b2g/components/ContentPermissionPrompt.js

@@ -188,7 +188,9 @@ ContentPermissionPrompt.prototype = {
     this.sendToBrowserWindow("permission-prompt", request, requestId, function(type, remember) {
       if (type == "permission-allow") {
         rememberPermission(request.type, principal, !remember);
+        if (callback) {
           callback();
+        }
         request.allow();
         return;
       }
@@ -202,7 +204,9 @@ ContentPermissionPrompt.prototype = {
                                         Ci.nsIPermissionManager.EXPIRE_SESSION, 0);
       }
 
+      if (callback) {
         callback();
+      }
       request.cancel();
     });
   },