From a56ba60c944c82265906f40088fddecb65705733 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Wed, 12 Apr 2017 10:10:22 -0700 Subject: [PATCH] "bmgr restore" really should wait until operation finishes. Test: manual test Bug 37246838 Change-Id: Ice381dc250e2d2a59cff48152dd3c8d6897d0804 --- cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java index bfcad1bb5f96b..1bcfb22fe2f2c 100644 --- a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java +++ b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java @@ -580,6 +580,11 @@ public final class Bmgr { } } + /** + * Wait until either {@link #restoreFinished} or {@link #restoreStarting} is called. + * Once one is called, it clears the internal flag again, so that the same observer intance + * can be reused for a next operation. + */ public void waitForCompletion() { // The restoreFinished() callback will throw the 'done' flag; we // just sit and wait on that notification. @@ -590,6 +595,7 @@ public final class Bmgr { } catch (InterruptedException ex) { } } + done = false; } } }