From 5f88f9b3553ba834d27fdde7ebf0412ceb111d48 Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Wed, 27 Apr 2016 08:45:53 -0700
Subject: [PATCH] Fix NPE when updating gear vertical location

Since we do this onLayout it's unnecessary to update the location here
plus it causes an NPE as the parent may not be laid out yet when
accessing collapsed height.

Bug: 28390732
Change-Id: I3e61eb7ce854002def3342856557d456249e5e26
---
 .../android/systemui/statusbar/ExpandableNotificationRow.java  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index caa15855d3759..2806729b835ad 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -263,9 +263,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
         int headsUpheight = headsUpCustom && beforeN ? mMaxHeadsUpHeightLegacy
                 : mMaxHeadsUpHeight;
         layout.setHeights(minHeight, headsUpheight, mNotificationMaxHeight);
-        if (mSettingsIconRow != null) {
-            mSettingsIconRow.updateVerticalLocation();
-        }
     }
 
     public StatusBarNotification getStatusBarNotification() {