commit 07f9306ef47c2067cbb5ae776ce9738b0aca3cd9
author Winson Chung <winsonc@google.com> Wed Oct 01 17:09:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 01 17:09:51 2014 +0000
tree 884a12f11300b308d263c0a8175f44bd648e0ddc
parent 5055589269409be8d2c70d11ba8d681fd627df92
parent 69a0645eb2025c54232c4b65544db581a183c1e7

am 69a0645e: am d1c1201d: am b61dea20: am da649073: Merge "Fixing regression with black task bar background. (Bug 17584337)" into lmp-dev

* commit '69a0645eb2025c54232c4b65544db581a183c1e7':
  Fixing regression with black task bar background. (Bug 17584337)

core/java/android/app/ActivityManager.java

diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 3d14c58..cd6088f 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -579,7 +579,7 @@
         public TaskDescription(TaskDescription td) {
             mLabel = td.mLabel;
             mIcon = td.mIcon;
-            setPrimaryColor(td.mColorPrimary);
+            mColorPrimary = td.mColorPrimary;
             mIconFilename = td.mIconFilename;
         }
 
@@ -600,7 +600,11 @@
          * @hide
          */
         public void setPrimaryColor(int primaryColor) {
-            mColorPrimary = 0xFF000000 | primaryColor;
+            // Ensure that the given color is valid
+            if ((primaryColor != 0) && (Color.alpha(primaryColor) != 255)) {
+                throw new RuntimeException("A TaskDescription's primary color should be opaque");
+            }
+            mColorPrimary = primaryColor;
         }
 
         /**