commit 1979bd7af2ed894c2914fe20462ddbdd312c00db
author Mady Mellor <madym@google.com> Wed Apr 27 20:14:54 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 27 20:14:57 2016 +0000
tree 6eb91b7966f011131dccac7778bd86283731bc4b
parent bd0f1fcd67cd4510e94822323a33a138f5477319
parent 5f88f9b3553ba834d27fdde7ebf0412ceb111d48

Merge "Fix NPE when updating gear vertical location" into nyc-dev

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index beba4f2..8239425 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 @@
         int headsUpheight = headsUpCustom && beforeN ? mMaxHeadsUpHeightLegacy
                 : mMaxHeadsUpHeight;
         layout.setHeights(minHeight, headsUpheight, mNotificationMaxHeight);
-        if (mSettingsIconRow != null) {
-            mSettingsIconRow.updateVerticalLocation();
-        }
     }
 
     public StatusBarNotification getStatusBarNotification() {