Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check for detached view in drag-related APIs" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-13 20:09:42 +00:00
committed by Android (Google) Code Review
parent d054f4f2fe 07452c37ab
commit cdc9d7bed9
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/View.java
View File

@@ -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);