Bug 963051 - "Home page lists" settings page causes Nightly to stop. r=margaret
authorChenxia Liu <liuche@mozilla.com>
Thu, 23 Jan 2014 15:38:48 -0800
changeset 181025 13febb220733b3f2db00cf2af88eee6765f1ec33
parent 181024 9cf4757cb559b919b7b91a14fe6be9557b8cbcbf
child 181026 1061661a111908aaaa9857952b507a0b2c7f3433
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret
bugs963051
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 963051 - "Home page lists" settings page causes Nightly to stop. r=margaret
mobile/android/base/home/HomeConfig.java
--- a/mobile/android/base/home/HomeConfig.java
+++ b/mobile/android/base/home/HomeConfig.java
@@ -163,18 +163,21 @@ public final class HomeConfig {
 
         public PanelConfig(PanelConfig panelConfig) {
             mType = panelConfig.mType;
             mTitle = panelConfig.mTitle;
             mId = panelConfig.mId;
             mLayoutType = panelConfig.mLayoutType;
 
             mViews = new ArrayList<ViewConfig>();
-            for (ViewConfig viewConfig : panelConfig.mViews) {
-                mViews.add(new ViewConfig(viewConfig));
+            List<ViewConfig> viewConfigs = panelConfig.mViews;
+            if (viewConfigs != null) {
+                for (ViewConfig viewConfig : viewConfigs) {
+                    mViews.add(new ViewConfig(viewConfig));
+                }
             }
             mFlags = panelConfig.mFlags.clone();
 
             validate();
         }
 
         public PanelConfig(PanelType type, String title, String id) {
             this(type, title, id, EnumSet.noneOf(Flags.class));