Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 2 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 3 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 4 | |
michael@0 | 5 | package org.mozilla.gecko; |
michael@0 | 6 | |
michael@0 | 7 | import java.util.concurrent.SynchronousQueue; |
michael@0 | 8 | import java.util.concurrent.TimeUnit; |
michael@0 | 9 | |
michael@0 | 10 | import android.app.Activity; |
michael@0 | 11 | |
michael@0 | 12 | public final class RobocopUtils { |
michael@0 | 13 | private static final int MAX_WAIT_MS = 20000; |
michael@0 | 14 | |
michael@0 | 15 | private RobocopUtils() {} |
michael@0 | 16 | |
michael@0 | 17 | public static void runOnUiThreadSync(Activity activity, final Runnable runnable) { |
michael@0 | 18 | final SynchronousQueue syncQueue = new SynchronousQueue(); |
michael@0 | 19 | activity.runOnUiThread( |
michael@0 | 20 | new Runnable() { |
michael@0 | 21 | public void run() { |
michael@0 | 22 | runnable.run(); |
michael@0 | 23 | try { |
michael@0 | 24 | syncQueue.put(new Object()); |
michael@0 | 25 | } catch (InterruptedException e) { |
michael@0 | 26 | FennecNativeDriver.log(FennecNativeDriver.LogLevel.ERROR, e); |
michael@0 | 27 | } |
michael@0 | 28 | } |
michael@0 | 29 | }); |
michael@0 | 30 | try { |
michael@0 | 31 | // Wait for the UiThread code to finish running |
michael@0 | 32 | if (syncQueue.poll(MAX_WAIT_MS, TimeUnit.MILLISECONDS) == null) { |
michael@0 | 33 | FennecNativeDriver.log(FennecNativeDriver.LogLevel.ERROR, |
michael@0 | 34 | "time-out waiting for UI thread"); |
michael@0 | 35 | FennecNativeDriver.logAllStackTraces(FennecNativeDriver.LogLevel.ERROR); |
michael@0 | 36 | } |
michael@0 | 37 | } catch (InterruptedException e) { |
michael@0 | 38 | FennecNativeDriver.log(FennecNativeDriver.LogLevel.ERROR, e); |
michael@0 | 39 | } |
michael@0 | 40 | } |
michael@0 | 41 | } |