Merge "Clarify that getLocalState is always valid for DragEvent" (d5ad2ff5) · Commits · e / os / android_frameworks_base

core/java/android/view/DragEvent.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ import com.android.internal.view.IDragAndDropPermissions;
		* <tr>
		* <td>ACTION_DRAG_ENDED</td>
		* <td style="text-align: center;"> </td>
		* <td style="text-align: center;"> </td>
		* <td style="text-align: center;">X</td>
		* <td style="text-align: center;"> </td>
		* <td style="text-align: center;"> </td>
		* <td style="text-align: center;"> </td>
		@@ -112,6 +112,7 @@ import com.android.internal.view.IDragAndDropPermissions;
		* </table>
		* <p>
		* The {@link android.view.DragEvent#getAction()},
		* {@link android.view.DragEvent#getLocalState()}
		* {@link android.view.DragEvent#describeContents()},
		* {@link android.view.DragEvent#writeToParcel(Parcel,int)}, and
		* {@link android.view.DragEvent#toString()} methods always return valid data.
		@@ -397,7 +398,7 @@ public class DragEvent implements Parcelable {
		* operation. In all other activities this method will return null
		* </p>
		* <p>
		* This method returns valid data for all event actions except for {@link #ACTION_DRAG_ENDED}.
		* This method returns valid data for all event actions.
		* </p>
		* @return The local state object sent to the system by startDragAndDrop().
		*/