Commit 41159f31 authored Sep 16, 2014 by Jeff Sharkey Committed by Android Git Automerger Sep 16, 2014

am 8d121c34: am 6abc3ef8: Merge "Whoops, wait around for pm result." into lmp-dev

* commit '8d121c344470001c18bc86125a954bdfb4ea95b0':
  Whoops, wait around for pm result.

cmds/pm/src/com/android/commands/pm/Pm.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -1702,7 +1702,11 @@ public final class Pm {
		}

		public Intent getResult() {
		return mResult.poll();
		try {
		return mResult.take();
		} catch (InterruptedException e) {
		throw new RuntimeException(e);
		}
		}
		}