OSDN Git Service

DO NOT MERGE Pipe context through to camera
authorSascha Häberling <haeberling@google.com>
Sat, 6 Sep 2014 02:50:42 +0000 (02:50 +0000)
committerAlan Newberger <alann@google.com>
Mon, 8 Sep 2014 18:57:43 +0000 (18:57 +0000)
commit156831104045ba4d2199a36d1a00fd8f748b7ae4
treea33467e9169581c62de5ef96bde8eabd5526147f
parent994d9136e0085e2fbb30f260ec140c8d2c6295df
DO NOT MERGE Pipe context through to camera

  Bug: 17203825

Not merging since a CL depending on this one cannot be merged cleanly into lmp-dev right now: http://ag/541468

Will also apply this one to haleakala.

Change-Id: I7a386b92cf6168185bd28bd02a78d87c5826639a
(cherry picked from commit 13d07d0ecb3bc808fb6f5b65508b1948ab3149d8)
src/com/android/camera/CaptureModule.java
src/com/android/camera/one/OneCameraManager.java
src/com/android/camera/one/v2/OneCameraManagerImpl.java
src_pd/com/android/camera/one/v2/OneCameraCreator.java