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

2016-04-27 20:14:54 +00:00
parent bd0f1fcd67 5f88f9b355
commit 1979bd7af2
1 changed files with 0 additions and 3 deletions
--- 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() {