commit 768012e4c18dd8650bf1b067f7e0b37a3c5db462
author Daichi Hirono <hirono@google.com> Mon Oct 30 10:05:37 2017 +0900
committer Daichi Hirono <hirono@google.com> Wed Nov 01 09:13:49 2017 +0900
tree 188d5ee9afa54f323b867489e5b6478030339253
parent 3bae0b027feb873cbb430ee1c3e0408e565b69f2

Make DragDropController#mDragState private

Before introducing the drag and drop callback, we need a write lock to preserve
the order of drag state update.

The CL changes the visibility of mDragState to private so that we can
ensure the upcoming write lock guards all updates for mDragState.

Bug: 65564090
Test: android.server.wm.CrossAppDragAndDropTests, manually check the
      drag and drop behavior on test app.
Change-Id: I3afc06221e4a9688b417768365e87b19706f9372

services/core/java/com/android/server/wm/InputMonitor.java

diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java
index d23369e..a4080ca 100644
--- a/services/core/java/com/android/server/wm/InputMonitor.java
+++ b/services/core/java/com/android/server/wm/InputMonitor.java
@@ -373,7 +373,7 @@
                 Log.d(TAG_WM, "Inserting drag window");
             }
             final InputWindowHandle dragWindowHandle =
-                    mService.mDragDropController.mDragState.getInputWindowHandle();
+                    mService.mDragDropController.getInputWindowHandleLocked();
             if (dragWindowHandle != null) {
                 addInputWindowHandle(dragWindowHandle);
             } else {
@@ -690,7 +690,7 @@
             // If there's a drag in progress and 'child' is a potential drop target,
             // make sure it's been told about the drag
             if (inDrag && isVisible && w.getDisplayContent().isDefaultDisplay) {
-                mService.mDragDropController.mDragState.sendDragStartedIfNeededLocked(w);
+                mService.mDragDropController.sendDragStartedIfNeededLocked(w);
             }
 
             addInputWindowHandle(