Merge "Fix bug 3109812 - NPE in ButtonGroup.dispatchDraw" (067222d1) · Commits · e / os / android_frameworks_base

core/java/android/widget/ButtonGroup.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -110,8 +110,13 @@ public class ButtonGroup extends LinearLayout {
		return;
		}
		mDivider = divider;
		if (divider != null) {
		mDividerWidth = divider.getIntrinsicWidth();
		mDividerHeight = divider.getIntrinsicHeight();
		} else {
		mDividerWidth = 0;
		mDividerHeight = 0;
		}
		requestLayout();
		}

		@@ -204,6 +209,11 @@ public class ButtonGroup extends LinearLayout {

		@Override
		public void dispatchDraw(Canvas canvas) {
		if (mDivider == null) {
		super.dispatchDraw(canvas);
		return;
		}

		final boolean begin = (mShowDividers & SHOW_DIVIDER_BEGINNING) == SHOW_DIVIDER_BEGINNING;
		final boolean middle = (mShowDividers & SHOW_DIVIDER_MIDDLE) == SHOW_DIVIDER_MIDDLE;
		final boolean end = (mShowDividers & SHOW_DIVIDER_END) == SHOW_DIVIDER_END;