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

This commit is contained in:
Mady Mellor
2016-04-27 20:14:54 +00:00
committed by Android (Google) Code Review

View File

@@ -263,9 +263,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
int headsUpheight = headsUpCustom && beforeN ? mMaxHeadsUpHeightLegacy int headsUpheight = headsUpCustom && beforeN ? mMaxHeadsUpHeightLegacy
: mMaxHeadsUpHeight; : mMaxHeadsUpHeight;
layout.setHeights(minHeight, headsUpheight, mNotificationMaxHeight); layout.setHeights(minHeight, headsUpheight, mNotificationMaxHeight);
if (mSettingsIconRow != null) {
mSettingsIconRow.updateVerticalLocation();
}
} }
public StatusBarNotification getStatusBarNotification() { public StatusBarNotification getStatusBarNotification() {