commit aca960204ef4e5300e95679e054802969fa7d141
author Winson Chung <winsonc@google.com> Fri May 09 15:04:08 2014 -0700
committer Winson Chung <winsonc@google.com> Fri May 09 16:18:55 2014 -0700
tree df1fedd6221ea268e891b6d80ded37d5fc3972b4
parent 918c0723a169cef46b8bf59c06fd3bb8021d0def

Fixing NPE in accessing theme attribute.

Change-Id: I5d21645b5530f13e1709021bd818de6bdb1d6544

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index ef6fcb7..6f56ca6 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -3499,13 +3499,16 @@
         }
 
         // Get the primary color and update the RecentsActivityValues for this activity
-        TypedArray a = getTheme().obtainStyledAttributes(com.android.internal.R.styleable.Theme);
-        int colorPrimary = a.getColor(com.android.internal.R.styleable.Theme_colorPrimary, 0);
-        a.recycle();
-        if (colorPrimary != 0) {
-            ActivityManager.RecentsActivityValues v = new ActivityManager.RecentsActivityValues();
-            v.colorPrimary = colorPrimary;
-            setRecentsActivityValues(v);
+        Resources.Theme tmpTheme = getTheme();
+        if (tmpTheme != null) {
+            TypedArray a = tmpTheme.obtainStyledAttributes(com.android.internal.R.styleable.Theme);
+            int colorPrimary = a.getColor(com.android.internal.R.styleable.Theme_colorPrimary, 0);
+            a.recycle();
+            if (colorPrimary != 0) {
+                ActivityManager.RecentsActivityValues v = new ActivityManager.RecentsActivityValues();
+                v.colorPrimary = colorPrimary;
+                setRecentsActivityValues(v);
+            }
         }
     }