Merge "Merge "DividerView choreographer set earlier to avoid null exception"... (aa7e6a0d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ public class DividerView extends FrameLayout implements OnTouchListener,
		private boolean mHomeStackResizable;
		private boolean mAdjustedForIme;
		private DividerState mState;
		private SurfaceFlingerVsyncChoreographer mSfChoreographer;
		private final SurfaceFlingerVsyncChoreographer mSfChoreographer;

		private final Handler mHandler = new Handler() {
		@Override
		@@ -250,20 +250,22 @@ public class DividerView extends FrameLayout implements OnTouchListener,
		};

		public DividerView(Context context) {
		super(context);
		this(context, null);
		}

		public DividerView(Context context, @Nullable AttributeSet attrs) {
		super(context, attrs);
		this(context, attrs, 0);
		}

		public DividerView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
		super(context, attrs, defStyleAttr);
		this(context, attrs, defStyleAttr, 0);
		}

		public DividerView(Context context, @Nullable AttributeSet attrs, int defStyleAttr,
		int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		mSfChoreographer = new SurfaceFlingerVsyncChoreographer(mHandler, context.getDisplay(),
		Choreographer.getInstance());
		}

		@Override
		@@ -313,8 +315,6 @@ public class DividerView extends FrameLayout implements OnTouchListener,
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();
		EventBus.getDefault().register(this);
		mSfChoreographer = new SurfaceFlingerVsyncChoreographer(mHandler, getDisplay(),
		Choreographer.getInstance());
		}

		@Override