From a554c707386eb8a6c6fb3a2399f23b79a1c17f74 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Fri, 17 Jun 2016 18:02:12 -0700
Subject: [PATCH] Fixed a potential issue where a notification could be empty

Change-Id: Ic4b294092a47d30c469dfbd1eb6ab31208533b1c
Fixes: 29158425
---
 .../android/systemui/statusbar/ExpandableNotificationRow.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index 39fce7b9243d7..20881402952e3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -1307,6 +1307,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
         if (!animated) {
             mPublicLayout.animate().cancel();
             mPrivateLayout.animate().cancel();
+            if (mChildrenContainer != null) {
+                mChildrenContainer.animate().cancel();
+                mChildrenContainer.setAlpha(1f);
+            }
             mPublicLayout.setAlpha(1f);
             mPrivateLayout.setAlpha(1f);
             mPublicLayout.setVisibility(mShowingPublic ? View.VISIBLE : View.INVISIBLE);