Merge "Ensure WAIT packet upon HELO in --suspend mode" am: 5e947c04e5 am: aea0bb4dc1 am: 6b86a653bf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2397595

Change-Id: I5953a70ac4e20e86ae62de54f7ad8e681431c74a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java
index ada5c55644e3..62d9c69565da 100644
--- a/core/java/android/os/Debug.java
+++ b/core/java/android/os/Debug.java
@@ -1006,12 +1006,15 @@ public final class Debug
         // been replaced with an implementation that will suspendAll and
         // send VM_START.
         System.out.println("Waiting for debugger first packet");
+
+        mWaiting = true;
         while (!isDebuggerConnected()) {
             try {
                 Thread.sleep(100);
             } catch (InterruptedException ie) {
             }
         }
+        mWaiting = false;
 
         System.out.println("Debug.suspendAllAndSentVmStart");
         VMDebug.suspendAllAndSendVmStart();