summaryrefslogtreecommitdiffstats
path: root/api/system-current.txt
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2015-06-09 18:29:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-09 18:29:08 +0000
commit7b7e1f97aac70b47b5faae5aa1db142275ee0518 (patch)
tree5a612d1d7b01c38aec12952c6a2a30f78eaa9916 /api/system-current.txt
parent2c936af815167b3f6bbb21d5dccea78b0bd348af (diff)
parentab60e7e6e0eae5e9ee4181b173bcd4807b6bd2f3 (diff)
downloadframeworks_base-7b7e1f97aac70b47b5faae5aa1db142275ee0518.zip
frameworks_base-7b7e1f97aac70b47b5faae5aa1db142275ee0518.tar.gz
frameworks_base-7b7e1f97aac70b47b5faae5aa1db142275ee0518.tar.bz2
Merge "ExifInterface: Add a few tag fields." into mnc-dev
Diffstat (limited to 'api/system-current.txt')
-rw-r--r--api/system-current.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index d1c81e3..3698b22 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -16483,6 +16483,7 @@ package android.media {
field public static final int ORIENTATION_UNDEFINED = 0; // 0x0
field public static final java.lang.String TAG_APERTURE = "FNumber";
field public static final java.lang.String TAG_DATETIME = "DateTime";
+ field public static final java.lang.String TAG_DATETIME_DIGITIZED = "DateTimeDigitized";
field public static final java.lang.String TAG_EXPOSURE_TIME = "ExposureTime";
field public static final java.lang.String TAG_FLASH = "Flash";
field public static final java.lang.String TAG_FOCAL_LENGTH = "FocalLength";
@@ -16501,6 +16502,9 @@ package android.media {
field public static final java.lang.String TAG_MAKE = "Make";
field public static final java.lang.String TAG_MODEL = "Model";
field public static final java.lang.String TAG_ORIENTATION = "Orientation";
+ field public static final java.lang.String TAG_SUBSEC_TIME = "SubSecTime";
+ field public static final java.lang.String TAG_SUBSEC_TIME_DIG = "SubSecTimeDigitized";
+ field public static final java.lang.String TAG_SUBSEC_TIME_ORIG = "SubSecTimeOriginal";
field public static final java.lang.String TAG_WHITE_BALANCE = "WhiteBalance";
field public static final int WHITEBALANCE_AUTO = 0; // 0x0
field public static final int WHITEBALANCE_MANUAL = 1; // 0x1