From d54a42f0f0cfdab18c89e4a29de67c81f48f60b1 Mon Sep 17 00:00:00 2001
From: akilawickey <asak999@gmail.com>
Date: Wed, 13 Jul 2016 03:46:57 +0530
Subject: [PATCH] fixed CB-11078 Empty string for BackgroundColor preference
 crashes application This closes #316

---
 framework/src/org/apache/cordova/CordovaActivity.java | 11 ++++++++---
 .../org/apache/cordova/test/CordovaActivityTest.java  |  3 +++
 test/res/xml/config.xml                               |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index 868b2430..577eb850 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -175,9 +175,14 @@ public class CordovaActivity extends Activity {
         setContentView(appView.getView());
 
         if (preferences.contains("BackgroundColor")) {
-            int backgroundColor = preferences.getInteger("BackgroundColor", Color.BLACK);
-            // Background of activity:
-            appView.getView().setBackgroundColor(backgroundColor);
+            try {
+                int backgroundColor = preferences.getInteger("BackgroundColor", Color.BLACK);
+                // Background of activity:
+                appView.getView().setBackgroundColor(backgroundColor);
+            }
+            catch (NumberFormatException e){
+                e.printStackTrace();
+            }
         }
 
         appView.getView().requestFocusFromTouch();
diff --git a/test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java b/test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java
index 1eebadb7..1533e799 100644
--- a/test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java
+++ b/test/androidTest/src/org/apache/cordova/test/CordovaActivityTest.java
@@ -42,4 +42,7 @@ public class CordovaActivityTest extends BaseCordovaIntegrationTest {
         String onPageFinishedUrl = testActivity.onPageFinishedUrl.take();
         assertEquals(MainTestActivity.START_URL, onPageFinishedUrl);
     }
+    protected void createViews() {
+        assertTrue(testView instanceof SystemWebView);
+    }
 }
diff --git a/test/res/xml/config.xml b/test/res/xml/config.xml
index 7da46385..744aeb17 100644
--- a/test/res/xml/config.xml
+++ b/test/res/xml/config.xml
@@ -35,6 +35,7 @@
     <preference name="useBrowserHistory" value="true" />
     <preference name="exit-on-suspend" value="false" />
     <preference name="showTitle" value="true" />
+    <preference name="BackgroundColor" value="" />
     <feature name="Activity">
         <param name="android-package" value="org.apache.cordova.test.ActivityPlugin" />
     </feature>