diff options
| author | Shashi Shekhar <shashishekhar@google.com> | 2015-03-06 21:40:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-06 21:40:35 +0000 |
| commit | 94aa337fb9fe49cc277727174db4846d767d78ec (patch) | |
| tree | b1d0f2a3be8da1f224c579e47712dc0d812382d9 /src_pd | |
| parent | 3a92e37230714aafc7fe8924e7f2d1413306da17 (diff) | |
| parent | 4361352633d1e106c1574c02ddd27c8891c5ee78 (diff) | |
| download | android_packages_apps_Camera2-94aa337fb9fe49cc277727174db4846d767d78ec.tar.gz android_packages_apps_Camera2-94aa337fb9fe49cc277727174db4846d767d78ec.tar.bz2 android_packages_apps_Camera2-94aa337fb9fe49cc277727174db4846d767d78ec.zip | |
Merge " Change interface of BurstMediaItem to provide filepath." into ub-camera-haleakala
Diffstat (limited to 'src_pd')
| -rw-r--r-- | src_pd/com/android/camera/burst/BurstControllerImpl.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src_pd/com/android/camera/burst/BurstControllerImpl.java b/src_pd/com/android/camera/burst/BurstControllerImpl.java index 6aad961a9..2c1d0a696 100644 --- a/src_pd/com/android/camera/burst/BurstControllerImpl.java +++ b/src_pd/com/android/camera/burst/BurstControllerImpl.java @@ -22,6 +22,7 @@ import com.android.camera.burst.BurstResultsListener; import com.android.camera.burst.EvictionHandler; import com.android.camera.burst.BurstController.ImageStreamProperties; import com.android.camera.one.v2.camera2proxy.ImageProxy; +import com.android.camera.session.CaptureSession; import java.util.List; @@ -41,7 +42,8 @@ class BurstControllerImpl implements BurstController { @Override public EvictionHandler startBurst(SurfaceTexture surfaceTexture, ImageStreamProperties imageStreamProperties, - BurstResultsListener resultsListener) { + BurstResultsListener resultsListener, + CaptureSession captureSession) { return null; } |