Merge \"Check for detached view in drag-related APIs\" into nyc-dev (71ab2397) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -20538,6 +20538,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		if (ViewDebug.DEBUG_DRAG) {
		Log.d(VIEW_LOG_TAG, "startDragAndDrop: data=" + data + " flags=" + flags);
		}
		if (mAttachInfo == null) {
		Log.w(VIEW_LOG_TAG, "startDragAndDrop called on a detached view.");
		return false;
		}
		boolean okay = false;

		Point shadowSize = new Point();
		@@ -20614,6 +20618,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		if (ViewDebug.DEBUG_DRAG) {
		Log.d(VIEW_LOG_TAG, "cancelDragAndDrop");
		}
		if (mAttachInfo == null) {
		Log.w(VIEW_LOG_TAG, "cancelDragAndDrop called on a detached view.");
		return;
		}
		if (mAttachInfo.mDragToken != null) {
		try {
		mAttachInfo.mSession.cancelDragAndDrop(mAttachInfo.mDragToken);
		@@ -20636,6 +20644,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		if (ViewDebug.DEBUG_DRAG) {
		Log.d(VIEW_LOG_TAG, "updateDragShadow");
		}
		if (mAttachInfo == null) {
		Log.w(VIEW_LOG_TAG, "updateDragShadow called on a detached view.");
		return;
		}
		if (mAttachInfo.mDragToken != null) {
		try {
		Canvas canvas = mAttachInfo.mDragSurface.lockCanvas(null);