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

am: 1979bd7

* commit '1979bd7af2ed894c2914fe20462ddbdd312c00db':
  Fix NPE when updating gear vertical location

Change-Id: If24a970bf33285b327a43687fd0a7a7c01a9ba22
This commit is contained in:
Mady Mellor
2016-04-27 20:41:08 +00:00
committed by android-build-merger

View File

@@ -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() {