Merge "Move async package to com.android.camera" into ub-camera-haleakala
diff --git a/src/com/android/camera/one/v2/async/BoundedBufferQueue.java b/src/com/android/camera/async/BoundedBufferQueue.java
similarity index 96%
rename from src/com/android/camera/one/v2/async/BoundedBufferQueue.java
rename to src/com/android/camera/async/BoundedBufferQueue.java
index e4c5c2f..9927982 100644
--- a/src/com/android/camera/one/v2/async/BoundedBufferQueue.java
+++ b/src/com/android/camera/async/BoundedBufferQueue.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.camera.one.v2.async;
+package com.android.camera.async;
/**
* A {@link BufferQueue} of instances of a limited, managed resource. At any given
diff --git a/src/com/android/camera/one/v2/async/BufferQueue.java b/src/com/android/camera/async/BufferQueue.java
similarity index 89%
rename from src/com/android/camera/one/v2/async/BufferQueue.java
rename to src/com/android/camera/async/BufferQueue.java
index 68281c3..927953d 100644
--- a/src/com/android/camera/one/v2/async/BufferQueue.java
+++ b/src/com/android/camera/async/BufferQueue.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.camera.one.v2.async;
+package com.android.camera.async;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -33,7 +33,7 @@
* @return The next available value.
* @throws InterruptedException If interrupted while waiting for the next
* value.
- * @throws com.android.camera.one.v2.async.BufferQueue.BufferQueueClosedException If the stream is closed and no more values
+ * @throws com.android.camera.async.BufferQueue.BufferQueueClosedException If the stream is closed and no more values
* will be available.
*/
public T getNext() throws InterruptedException, BufferQueueClosedException;
@@ -46,7 +46,7 @@
* @return The next available value.
* @throws InterruptedException If interrupted while waiting for the next
* value.
- * @throws com.android.camera.one.v2.async.BufferQueue.BufferQueueClosedException If the stream is closed and no more values
+ * @throws com.android.camera.async.BufferQueue.BufferQueueClosedException If the stream is closed and no more values
* will be available.
* @throws TimeoutException If no new value is made available within the
* specified time limit.
diff --git a/src/com/android/camera/one/v2/async/BufferQueueController.java b/src/com/android/camera/async/BufferQueueController.java
similarity index 96%
rename from src/com/android/camera/one/v2/async/BufferQueueController.java
rename to src/com/android/camera/async/BufferQueueController.java
index 9f67141..89dd2e5 100644
--- a/src/com/android/camera/one/v2/async/BufferQueueController.java
+++ b/src/com/android/camera/async/BufferQueueController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.camera.one.v2.async;
+package com.android.camera.async;
/**
* An output stream of objects which can be closed from either the producer or
diff --git a/src/com/android/camera/one/v2/async/ConcurrentBufferQueue.java b/src/com/android/camera/async/ConcurrentBufferQueue.java
similarity index 99%
rename from src/com/android/camera/one/v2/async/ConcurrentBufferQueue.java
rename to src/com/android/camera/async/ConcurrentBufferQueue.java
index b31ecd5..2347af2 100644
--- a/src/com/android/camera/one/v2/async/ConcurrentBufferQueue.java
+++ b/src/com/android/camera/async/ConcurrentBufferQueue.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.camera.one.v2.async;
+package com.android.camera.async;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/camera/one/v2/async/FutureResult.java b/src/com/android/camera/async/FutureResult.java
similarity index 98%
rename from src/com/android/camera/one/v2/async/FutureResult.java
rename to src/com/android/camera/async/FutureResult.java
index be96ae2..e53d263 100644
--- a/src/com/android/camera/one/v2/async/FutureResult.java
+++ b/src/com/android/camera/async/FutureResult.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.camera.one.v2.async;
+package com.android.camera.async;
import java.util.concurrent.CancellationException;
import java.util.concurrent.CountDownLatch;
diff --git a/src/com/android/camera/one/v2/async/RefCountBase.java b/src/com/android/camera/async/RefCountBase.java
similarity index 97%
rename from src/com/android/camera/one/v2/async/RefCountBase.java
rename to src/com/android/camera/async/RefCountBase.java
index 7b9fb47..c959b46 100644
--- a/src/com/android/camera/one/v2/async/RefCountBase.java
+++ b/src/com/android/camera/async/RefCountBase.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.camera.one.v2.async;
+package com.android.camera.async;
/**
* Wraps an object with reference counting. When the reference count goes to 0
diff --git a/src/com/android/camera/one/v2/async/RefCountedBufferQueueController.java b/src/com/android/camera/async/RefCountedBufferQueueController.java
similarity index 96%
rename from src/com/android/camera/one/v2/async/RefCountedBufferQueueController.java
rename to src/com/android/camera/async/RefCountedBufferQueueController.java
index e370119..66a6807 100644
--- a/src/com/android/camera/one/v2/async/RefCountedBufferQueueController.java
+++ b/src/com/android/camera/async/RefCountedBufferQueueController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.camera.one.v2.async;
+package com.android.camera.async;
/**
* Wraps a {@link BufferQueueController} with reference counting.
diff --git a/src/com/android/camera/one/v2/async/SafeCloseable.java b/src/com/android/camera/async/SafeCloseable.java
similarity index 94%
rename from src/com/android/camera/one/v2/async/SafeCloseable.java
rename to src/com/android/camera/async/SafeCloseable.java
index 8d87f67..8b61348 100644
--- a/src/com/android/camera/one/v2/async/SafeCloseable.java
+++ b/src/com/android/camera/async/SafeCloseable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.camera.one.v2.async;
+package com.android.camera.async;
/**
* An {@link AutoCloseable} which should not throw in {@link #close}.
diff --git a/src/com/android/camera/one/v2/camera2proxy/ImageProxy.java b/src/com/android/camera/one/v2/camera2proxy/ImageProxy.java
index 27acac9..ce90bcd 100644
--- a/src/com/android/camera/one/v2/camera2proxy/ImageProxy.java
+++ b/src/com/android/camera/one/v2/camera2proxy/ImageProxy.java
@@ -18,7 +18,7 @@
import android.graphics.Rect;
-import com.android.camera.one.v2.async.SafeCloseable;
+import com.android.camera.async.SafeCloseable;
/**
* Wraps {@link android.media.Image} with a mockable interface.
diff --git a/src/com/android/camera/one/v2/components/FullAFScanCommand.java b/src/com/android/camera/one/v2/components/FullAFScanCommand.java
index 84ff9c8..20f2477 100644
--- a/src/com/android/camera/one/v2/components/FullAFScanCommand.java
+++ b/src/com/android/camera/one/v2/components/FullAFScanCommand.java
@@ -22,7 +22,7 @@
import android.hardware.camera2.CaptureRequest;
import android.hardware.camera2.CaptureResult;
-import com.android.camera.one.v2.async.BufferQueue;
+import com.android.camera.async.BufferQueue;
import com.android.camera.one.v2.core.FrameServer;
import com.android.camera.one.v2.core.MetadataChangeResponseListener;
import com.android.camera.one.v2.core.RequestBuilder;
diff --git a/src/com/android/camera/one/v2/components/StaticPictureCommand.java b/src/com/android/camera/one/v2/components/StaticPictureCommand.java
index 30170a2..b7e837c 100644
--- a/src/com/android/camera/one/v2/components/StaticPictureCommand.java
+++ b/src/com/android/camera/one/v2/components/StaticPictureCommand.java
@@ -21,7 +21,7 @@
import android.hardware.camera2.CameraAccessException;
import android.hardware.camera2.CameraDevice;
-import com.android.camera.one.v2.async.BufferQueue;
+import com.android.camera.async.BufferQueue;
import com.android.camera.one.v2.camera2proxy.ImageProxy;
import com.android.camera.one.v2.core.FrameServer;
import com.android.camera.one.v2.core.RequestBuilder;
diff --git a/src/com/android/camera/one/v2/core/CaptureStream.java b/src/com/android/camera/one/v2/core/CaptureStream.java
index 37b8614..87ea16b 100644
--- a/src/com/android/camera/one/v2/core/CaptureStream.java
+++ b/src/com/android/camera/one/v2/core/CaptureStream.java
@@ -18,7 +18,7 @@
import android.view.Surface;
-import com.android.camera.one.v2.async.BufferQueue;
+import com.android.camera.async.BufferQueue;
/**
* A generic Surface-holding object which can be attached to a {@link Request},
@@ -34,7 +34,7 @@
* </p>
* <p>
* Implementations should use the {@link CaptureStream#bind} method to kick off
- * a process of taking, as input, a {@link com.android.camera.one.v2.async.BufferQueue} of image timestamps as well
+ * a process of taking, as input, a {@link com.android.camera.async.BufferQueue} of image timestamps as well
* as the images added to the {@link Surface}, and producing, as output, a
* stream of useful handles to the image data.
* </p>
diff --git a/src/com/android/camera/one/v2/core/FrameworkFailureResponseListener.java b/src/com/android/camera/one/v2/core/FrameworkFailureResponseListener.java
index c1cf131..59b243a 100644
--- a/src/com/android/camera/one/v2/core/FrameworkFailureResponseListener.java
+++ b/src/com/android/camera/one/v2/core/FrameworkFailureResponseListener.java
@@ -21,8 +21,8 @@
import android.hardware.camera2.CaptureResult;
import android.hardware.camera2.TotalCaptureResult;
-import com.android.camera.one.v2.async.ConcurrentBufferQueue;
-import com.android.camera.one.v2.async.BufferQueue;
+import com.android.camera.async.ConcurrentBufferQueue;
+import com.android.camera.async.BufferQueue;
/**
* A {@link ResponseListener} which provides a
diff --git a/src/com/android/camera/one/v2/core/MetadataChangeResponseListener.java b/src/com/android/camera/one/v2/core/MetadataChangeResponseListener.java
index 46d0cd6..9c2606d 100644
--- a/src/com/android/camera/one/v2/core/MetadataChangeResponseListener.java
+++ b/src/com/android/camera/one/v2/core/MetadataChangeResponseListener.java
@@ -20,8 +20,8 @@
import android.hardware.camera2.CaptureResult;
import android.hardware.camera2.TotalCaptureResult;
-import com.android.camera.one.v2.async.ConcurrentBufferQueue;
-import com.android.camera.one.v2.async.BufferQueue;
+import com.android.camera.async.ConcurrentBufferQueue;
+import com.android.camera.async.BufferQueue;
/**
* A {@link ResponseListener} which listens for changes to a particular metadata
diff --git a/src/com/android/camera/one/v2/core/RefCountedImageProxy.java b/src/com/android/camera/one/v2/core/RefCountedImageProxy.java
index fc78861..9e5b2f1 100644
--- a/src/com/android/camera/one/v2/core/RefCountedImageProxy.java
+++ b/src/com/android/camera/one/v2/core/RefCountedImageProxy.java
@@ -16,9 +16,7 @@
package com.android.camera.one.v2.core;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import com.android.camera.one.v2.async.RefCountBase;
+import com.android.camera.async.RefCountBase;
import com.android.camera.one.v2.camera2proxy.ImageProxy;
/**
diff --git a/src/com/android/camera/one/v2/core/RequestBuilder.java b/src/com/android/camera/one/v2/core/RequestBuilder.java
index 5652138..e56c83e 100644
--- a/src/com/android/camera/one/v2/core/RequestBuilder.java
+++ b/src/com/android/camera/one/v2/core/RequestBuilder.java
@@ -25,7 +25,7 @@
import android.hardware.camera2.CaptureRequest;
import android.view.Surface;
-import com.android.camera.one.v2.async.BufferQueue;
+import com.android.camera.async.BufferQueue;
import com.android.camera.one.v2.camera2proxy.CaptureRequestBuilderProxy;
/**
diff --git a/src/com/android/camera/one/v2/core/SimpleCaptureStream.java b/src/com/android/camera/one/v2/core/SimpleCaptureStream.java
index 1ed9c70..633268b 100644
--- a/src/com/android/camera/one/v2/core/SimpleCaptureStream.java
+++ b/src/com/android/camera/one/v2/core/SimpleCaptureStream.java
@@ -18,7 +18,7 @@
import android.view.Surface;
-import com.android.camera.one.v2.async.BufferQueue;
+import com.android.camera.async.BufferQueue;
/**
* A {@link CaptureStream} which just registers a {@link Surface} without
diff --git a/src/com/android/camera/one/v2/core/TimestampResponseListener.java b/src/com/android/camera/one/v2/core/TimestampResponseListener.java
index 1d21656..a9c5683 100644
--- a/src/com/android/camera/one/v2/core/TimestampResponseListener.java
+++ b/src/com/android/camera/one/v2/core/TimestampResponseListener.java
@@ -20,8 +20,8 @@
import android.hardware.camera2.CaptureResult;
import android.hardware.camera2.TotalCaptureResult;
-import com.android.camera.one.v2.async.ConcurrentBufferQueue;
-import com.android.camera.one.v2.async.BufferQueue;
+import com.android.camera.async.ConcurrentBufferQueue;
+import com.android.camera.async.BufferQueue;
/**
* A {@link ResponseListener} which provides a stream of timestamps.
diff --git a/src/com/android/camera/one/v2/core/TotalCaptureResultResponseListener.java b/src/com/android/camera/one/v2/core/TotalCaptureResultResponseListener.java
index 8cc2c0a..f6be60d 100644
--- a/src/com/android/camera/one/v2/core/TotalCaptureResultResponseListener.java
+++ b/src/com/android/camera/one/v2/core/TotalCaptureResultResponseListener.java
@@ -20,8 +20,8 @@
import android.hardware.camera2.CaptureResult;
import android.hardware.camera2.TotalCaptureResult;
-import com.android.camera.one.v2.async.ConcurrentBufferQueue;
-import com.android.camera.one.v2.async.BufferQueue;
+import com.android.camera.async.ConcurrentBufferQueue;
+import com.android.camera.async.BufferQueue;
/**
* A {@link ResponseListener} which provides a stream of
diff --git a/src/com/android/camera/one/v2/sharedimagereader/BoundedImageBufferQueue.java b/src/com/android/camera/one/v2/sharedimagereader/BoundedImageBufferQueue.java
index 5882a35..ce1e893 100644
--- a/src/com/android/camera/one/v2/sharedimagereader/BoundedImageBufferQueue.java
+++ b/src/com/android/camera/one/v2/sharedimagereader/BoundedImageBufferQueue.java
@@ -20,15 +20,15 @@
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
-import com.android.camera.one.v2.async.BoundedBufferQueue;
-import com.android.camera.one.v2.async.ConcurrentBufferQueue;
-import com.android.camera.one.v2.async.BufferQueueController;
+import com.android.camera.async.BoundedBufferQueue;
+import com.android.camera.async.ConcurrentBufferQueue;
+import com.android.camera.async.BufferQueueController;
import com.android.camera.one.v2.camera2proxy.ImageProxy;
/**
* A {@link BoundedBufferQueue} of {@link ImageProxy}s for which only a finite
* number of {@link ImageProxy}s may be retrieved before further requests, via
- * {@link com.android.camera.one.v2.async.BufferQueue#getNext()}, will block for
+ * {@link com.android.camera.async.BufferQueue#getNext()}, will block for
* the closing of previously-retrieved {@link ImageProxy}s.
* <p/>
* The ability to acquire another image is represented by a logical "ticket".
@@ -48,7 +48,7 @@
* <p/>
* Note that it is the stream consumer's responsibility to explicitly close()
* Images to avoid deadlocking when calling
- * {@link com.android.camera.one.v2.async.BufferQueue#getNext}.
+ * {@link com.android.camera.async.BufferQueue#getNext}.
*
* TODO Refactor ticket-pool logic into a separate class.
*/
diff --git a/src/com/android/camera/one/v2/sharedimagereader/ImageDistributor.java b/src/com/android/camera/one/v2/sharedimagereader/ImageDistributor.java
index 6f1153e..6ce1908 100644
--- a/src/com/android/camera/one/v2/sharedimagereader/ImageDistributor.java
+++ b/src/com/android/camera/one/v2/sharedimagereader/ImageDistributor.java
@@ -22,8 +22,8 @@
import java.util.List;
import java.util.Set;
-import com.android.camera.one.v2.async.BufferQueue;
-import com.android.camera.one.v2.async.BufferQueueController;
+import com.android.camera.async.BufferQueue;
+import com.android.camera.async.BufferQueueController;
import com.android.camera.one.v2.camera2proxy.ImageProxy;
import com.android.camera.one.v2.core.RefCountedImageProxy;
import com.android.camera.one.v2.core.SingleCloseImageProxy;
diff --git a/src/com/android/camera/one/v2/sharedimagereader/SharedImageReader.java b/src/com/android/camera/one/v2/sharedimagereader/SharedImageReader.java
index ee7e1f1..fe340d4 100644
--- a/src/com/android/camera/one/v2/sharedimagereader/SharedImageReader.java
+++ b/src/com/android/camera/one/v2/sharedimagereader/SharedImageReader.java
@@ -24,8 +24,8 @@
import android.media.ImageReader;
import android.view.Surface;
-import com.android.camera.one.v2.async.RefCountedBufferQueueController;
-import com.android.camera.one.v2.async.BufferQueue;
+import com.android.camera.async.RefCountedBufferQueueController;
+import com.android.camera.async.BufferQueue;
import com.android.camera.one.v2.camera2proxy.ImageProxy;
import com.android.camera.one.v2.core.CaptureStream;