summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2014-05-24 00:25:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-24 00:25:59 +0000
commit0bfa56e76630647b7b277141d717ab434295ac5c (patch)
tree86d43b64ae8a7aea975ac3bbfa759b8205d97781 /api
parent13c8cdfb1d5996763fecd26addb706536a972d03 (diff)
parentb6079005ed0631c3972ff427f56e12523ec214a7 (diff)
downloadframeworks_base-0bfa56e76630647b7b277141d717ab434295ac5c.zip
frameworks_base-0bfa56e76630647b7b277141d717ab434295ac5c.tar.gz
frameworks_base-0bfa56e76630647b7b277141d717ab434295ac5c.tar.bz2
Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt26
1 files changed, 13 insertions, 13 deletions
diff --git a/api/current.txt b/api/current.txt
index b270698..a829bdf 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12632,6 +12632,19 @@ package android.hardware.camera2 {
method public final int hashCode();
}
+ public final class DngCreator implements java.lang.AutoCloseable {
+ ctor public DngCreator(android.hardware.camera2.CameraCharacteristics, android.hardware.camera2.CaptureResult);
+ method public void close();
+ method public android.hardware.camera2.DngCreator setDescription(java.lang.String);
+ method public android.hardware.camera2.DngCreator setLocation(android.location.Location);
+ method public android.hardware.camera2.DngCreator setOrientation(int);
+ method public android.hardware.camera2.DngCreator setThumbnail(android.graphics.Bitmap);
+ method public android.hardware.camera2.DngCreator setThumbnail(android.media.Image);
+ method public void writeByteBuffer(java.io.OutputStream, android.util.Size, java.nio.ByteBuffer, long) throws java.io.IOException;
+ method public void writeImage(java.io.OutputStream, android.media.Image) throws java.io.IOException;
+ method public void writeInputStream(java.io.OutputStream, android.util.Size, java.io.InputStream, long) throws java.io.IOException;
+ }
+
}
package android.hardware.camera2.params {
@@ -14100,19 +14113,6 @@ package android.media {
ctor public DeniedByServerException(java.lang.String);
}
- public final class DngCreator implements java.lang.AutoCloseable {
- ctor public DngCreator(android.hardware.camera2.CameraCharacteristics, android.hardware.camera2.CaptureResult);
- method public void close();
- method public android.media.DngCreator setDescription(java.lang.String);
- method public android.media.DngCreator setLocation(android.location.Location);
- method public android.media.DngCreator setOrientation(int);
- method public android.media.DngCreator setThumbnail(android.graphics.Bitmap);
- method public android.media.DngCreator setThumbnail(android.media.Image);
- method public void writeByteBuffer(java.io.OutputStream, android.util.Size, java.nio.ByteBuffer, long) throws java.io.IOException;
- method public void writeImage(java.io.OutputStream, android.media.Image) throws java.io.IOException;
- method public void writeInputStream(java.io.OutputStream, android.util.Size, java.io.InputStream, long) throws java.io.IOException;
- }
-
public class ExifInterface {
ctor public ExifInterface(java.lang.String) throws java.io.IOException;
method public double getAltitude(double);