Bug 919902 - [B2G][Helix][System][denghuachang]Device can not enter OS and stay on the third logo after uninstall some applications r=ferjm

dom/apps/src/Webapps.jsm

@@ -252,6 +252,12 @@ this.DOMApplicationRegistry = {
       // twice
       this._readManifests(ids, (function readCSPs(aResults) {
         aResults.forEach(function registerManifest(aResult) {
+          if (!aResult.manifest) {
+            // If we can't load the manifest, we probably have a corrupted
+            // registry. We delete the app since we can't do anything with it.
+            delete this.webapps[aResult.id];
+            return;
+          }
           let app = this.webapps[aResult.id];
           app.csp = aResult.manifest.csp || "";
           app.role = aResult.manifest.role || "";
@@ -816,6 +822,12 @@ this.DOMApplicationRegistry = {
       aResults.forEach(function registerManifest(aResult) {
         let app = this.webapps[aResult.id];
         let manifest = aResult.manifest;
+        if (!manifest) {
+          // If we can't load the manifest, we probably have a corrupted
+          // registry. We delete the app since we can't do anything with it.
+          delete this.webapps[aResult.id];
+          return;
+        }
         app.name = manifest.name;
         app.csp = manifest.csp || "";
         app.role = manifest.role || "";