Lajos Molnar
f95ec89db2
Merge "media: expose MediaFormat.KEY_HDR_STATIC_INFO key" into nyc-dev am: 79c1bc8434
...
am: 9c5a5f0930
* commit '9c5a5f09307ae2d099b34cb0468860a1020327bb':
media: expose MediaFormat.KEY_HDR_STATIC_INFO key
2016-03-11 01:56:57 +00:00
Lajos Molnar
79c1bc8434
Merge "media: expose MediaFormat.KEY_HDR_STATIC_INFO key" into nyc-dev
2016-03-11 01:44:28 +00:00
Jaesung Chung
9f4be88593
Merge "ExifInterface: implement the serialzation for Exif IFD structures" into nyc-dev am: 89cb194542
...
am: 20f5cd3fcc
* commit '20f5cd3fccc377e1a769192197aa97971aefee45':
ExifInterface: implement the serialzation for Exif IFD structures
2016-03-10 08:43:15 +00:00
Jaesung Chung
89cb194542
Merge "ExifInterface: implement the serialzation for Exif IFD structures" into nyc-dev
2016-03-10 08:35:24 +00:00
Jaesung Chung
86e552b9fa
ExifInterface: implement the serialzation for Exif IFD structures
...
One image can have multiple image file directories, which stores the
attributes of the image, in Exif specification to save metadata.
In the old version, the all attributes from several image file
directories were combined in a one hash map eventually and were served
without distinction of the original IFD group.
In order to keep the original data as much as possible, it loads/saves
the attributes based on the original IFD group internally.
Bug: 26044456, Bug: 11224701
Change-Id: I416e4e79fd47461c9aa83ce13591ed1a5d42f26e
2016-03-10 15:51:41 +09:00
Jaesung Chung
b0ecc64812
Merge "ExifInterface: fix a bug in readExifEntryValue" into nyc-dev am: e834dd78d4
...
am: 7f5a0fba66
* commit '7f5a0fba663d929753845ec2db778fd000c3f5a4':
ExifInterface: fix a bug in readExifEntryValue
2016-03-10 04:32:49 +00:00
Jaesung Chung
e834dd78d4
Merge "ExifInterface: fix a bug in readExifEntryValue" into nyc-dev
2016-03-10 04:26:52 +00:00
Jeff Sharkey
1c6871e8e4
Merge "Resolve ringtone Uris using Context user." into nyc-dev am: 2478f36428
...
am: 6aefc85def
* commit '6aefc85def6e6bab3dac457a24a424237ac4e427':
Resolve ringtone Uris using Context user.
2016-03-09 22:11:33 +00:00
Jeff Sharkey
2478f36428
Merge "Resolve ringtone Uris using Context user." into nyc-dev
2016-03-09 21:59:20 +00:00
Jeff Sharkey
265551de72
Resolve ringtone Uris using Context user.
...
The Context passed in has already been tied strongly to a specific
user, so resolve Settings based on that user.
Bug: 27568161
Change-Id: I1365c25f97c4177afe592d7c9f410eab777110e7
2016-03-09 14:56:01 -07:00
Jaesung Chung
ad76dc2e62
ExifInterface: fix a bug in readExifEntryValue
...
The readExifEntry method has raised an unnessary EOFException on reading
an non-ASCII byte array.
Bug: 27484747
Change-Id: I19371e0eed25770929f50b3ca25f249c50113925
2016-03-09 23:21:32 +09:00
Jaesung Chung
f3d3686ecc
Merge "ExifInterface: add RAW input stream support" into nyc-dev am: bd1dc40a3b
...
am: 6ac8a0d423
* commit '6ac8a0d423da9a62734ed92a7c932d1af9cfadef':
ExifInterface: add RAW input stream support
2016-03-09 08:31:31 +00:00
Jaesung Chung
bd1dc40a3b
Merge "ExifInterface: add RAW input stream support" into nyc-dev
2016-03-09 08:23:06 +00:00
Jaesung Chung
6e08d2b082
ExifInterface: add RAW input stream support
...
And also the following things are included:
- Remove mInputStream.
- Update javadoc accordingly.
Bug: 11224701
Change-Id: I30b4c29ac800ae396fca8f6b2c2c0f68028a44b3
2016-03-09 17:22:11 +09:00
Sungsoo Lim
17872a8580
Merge "MediaBrowser: Copy options before calling subscribeInternal()" into nyc-dev am: 33441e7f2a
...
am: eef1c12312
* commit 'eef1c123120ff0ebbc90868df15ad50fce277533':
MediaBrowser: Copy options before calling subscribeInternal()
2016-03-09 07:48:14 +00:00
Sungsoo Lim
df91a67953
MediaBrowser: Copy options before calling subscribeInternal()
...
If MediaBrowser and MediaBrowserService are on the same process,
the options object could be shared.
Bug: 27398805
Change-Id: I61ce63f667e46229662d85cd6f417b104f9d1388
2016-03-09 16:03:23 +09:00
Lajos Molnar
ac76fa3581
media: expose MediaFormat.KEY_HDR_STATIC_INFO key
...
Bug: 25684127
Change-Id: I6c48f8ed11a23e5d47210d15be4f759bd93ba1da
2016-03-08 20:38:10 -08:00
Zhijun He
8cf51da9f1
Merge "ImageReader/Writer: refactor and cleanup" into nyc-dev am: 924dd55528
...
am: 79f135dc3b
* commit '79f135dc3b2ade4040dfee5ae3edfcd02ffe88ef':
ImageReader/Writer: refactor and cleanup
2016-03-09 01:17:59 +00:00
Zhijun He
924dd55528
Merge "ImageReader/Writer: refactor and cleanup" into nyc-dev
2016-03-09 01:09:34 +00:00
Paul McLean
0d39df92eb
Merge "Make native_release() methods in AudioTrack and AudioRecord JNI-callable." into nyc-dev am: 70612efe65
...
am: 7d0473c569
* commit '7d0473c569667735e4a63b4ed6b7ae4577504eeb':
Make native_release() methods in AudioTrack and AudioRecord JNI-callable.
2016-03-09 00:32:34 +00:00
Paul Mclean
70612efe65
Merge "Make native_release() methods in AudioTrack and AudioRecord JNI-callable." into nyc-dev
2016-03-09 00:00:08 +00:00
Jae Seo
18fa3cc259
Merge "TIF: Drop the requirement for ID tuple for non-broadcast channels" into nyc-dev am: e75f77326e
...
am: 83f70c1042
* commit '83f70c1042760290eb17e2d25aaa2176b7c1fe76':
TIF: Drop the requirement for ID tuple for non-broadcast channels
2016-03-08 23:18:51 +00:00
Jae Seo
e75f77326e
Merge "TIF: Drop the requirement for ID tuple for non-broadcast channels" into nyc-dev
2016-03-08 22:49:30 +00:00
Paul McLean
c69ac54111
Make native_release() methods in AudioTrack and AudioRecord JNI-callable.
...
Change-Id: I31f8946579438021ba8f7ec58bf301a190082063
2016-03-08 15:47:35 -07:00
Dongwon Kang
33315dbb4f
Merge "TIF: Unhide TvView.setZOrderMediaOverlay/setZOrderOnTop/tune/unblockContent" into nyc-dev am: 08713d2a0e
...
am: 77e46befc8
* commit '77e46befc8ce665d88c22d34d500d1e3b24c8c7a':
TIF: Unhide TvView.setZOrderMediaOverlay/setZOrderOnTop/tune/unblockContent
2016-03-08 22:45:03 +00:00
Dongwon Kang
08713d2a0e
Merge "TIF: Unhide TvView.setZOrderMediaOverlay/setZOrderOnTop/tune/unblockContent" into nyc-dev
2016-03-08 22:11:13 +00:00
Zhijun He
0ab416269a
ImageReader/Writer: refactor and cleanup
...
Below changes are included:
* Defer the buffer lock to Image#getPlanes call. This will save quite a bit
CPU cycles associated with lock buffer if the application doesn't really
want to access the data.
* Refactor the code: move some common code to some utility class, and use
one unified consumer (BufferItemConsumer) in ImageReader native implementation.
The code refactoring will also make it easier to support non-opaque image
attach/detach.
Bug: 22356918
Bug: 19962027
Change-Id: I4fb865b0ea3deb6650afc64c32a5906f30e8ccbd
2016-03-08 13:21:36 -08:00
Jae Seo
c0e5873599
TIF: Drop the requirement for ID tuple for non-broadcast channels
...
This has been causing some confusion among streaming-based channel app
developers without having any clear benefit, hence drop the requirement.
Bug: 27536480
Change-Id: I51be65ccc402171a0ce34ae4640905ec48d39e37
2016-03-08 11:41:29 -08:00
Dongwon Kang
e12d810e99
TIF: Unhide TvView.setZOrderMediaOverlay/setZOrderOnTop/tune/unblockContent
...
Bug: 25726685
Change-Id: If96d0b086488c931d20315ee1c29cf7374715d93
2016-03-08 10:53:09 -08:00
Jean-Michel Trivi
92b473df6c
Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev am: 84dee4f16c
...
am: 2392ab9bbd
* commit '2392ab9bbd30ed5ffcab00aec1bb6b46552c484f':
Rename AudioRecordConfiguration to AudioRecordingConfiguration
2016-03-08 17:03:35 +00:00
Jean-Michel Trivi
84dee4f16c
Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev
2016-03-08 16:46:58 +00:00
Jae Seo
707bc796fb
Merge "TIF: Add more comments for TvInputInfo/TvTrackInfo" into nyc-dev am: 3c420f669b
...
am: 5840ce60d9
* commit '5840ce60d9353c16e685915c2d5d26c8ebffbdc4':
TIF: Add more comments for TvInputInfo/TvTrackInfo
2016-03-08 05:50:09 +00:00
Jae Seo
6256e27c1b
TIF: Add more comments for TvInputInfo/TvTrackInfo
...
- Documented what TvInputInfo.getTunerCount returns if the input is not
of TYPE_TUNER.
- Documented what all getters/setters in TvTrackInfo throw if not called
on proper types.
Bug: 27531254
Change-Id: I32d83ce888507ec29cda8dce74871a3d55783766
2016-03-07 20:09:43 -08:00
Sungsoo Lim
7b5b3a1a4f
Merge "MediaBrowser: Copy options before using it in subscribe()" into nyc-dev am: e10739ab8b
...
am: b828147539
* commit 'b828147539fc4bab13d87d12850531012f165739':
MediaBrowser: Copy options before using it in subscribe()
2016-03-08 01:52:06 +00:00
Sungsoo Lim
e10739ab8b
Merge "MediaBrowser: Copy options before using it in subscribe()" into nyc-dev
2016-03-08 01:46:13 +00:00
Jean-Michel Trivi
598c0c9f65
Rename AudioRecordConfiguration to AudioRecordingConfiguration
...
In package android.media:
- rename AudioRecordConfiguration to
AudioRecordingConfiguration to avoid ambiguity with the
android.media.AudioRecord class
- rename AudioManager.getActiveRecordConfigurations() to
getActiveRecordingConfigurations.
Bug 27385560
Change-Id: I5ef404ff36522193990c9b563d4545893529b365
2016-03-07 16:05:51 -08:00
Jean-Michel Trivi
fb7a388b9d
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
...
am: 4f9c05c382
* commit '4f9c05c3823ea73b17fb6b14707dc2ce3f9d760c':
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
2016-03-07 21:11:44 +00:00
Jean-Michel Trivi
4f9c05c382
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
...
This reverts commit 99278e1c72 .
Change-Id: Ifcb3f17a26df8171cbc21dac093477b98a1333db
(cherry picked from commit 431ec6cdb9 )
2016-03-07 21:00:25 +00:00
Jean-Michel Trivi
310355d28e
Merge "Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"" into nyc-dev
2016-03-07 19:59:42 +00:00
Jean-Michel Trivi
431ec6cdb9
Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"
...
This reverts commit 99278e1c72 .
Change-Id: Ifcb3f17a26df8171cbc21dac093477b98a1333db
2016-03-07 19:59:21 +00:00
Jean-Michel Trivi
cffe9145ec
Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev am: 46f5429768
...
am: b4a08fbd00
* commit 'b4a08fbd00d631f8f2508915e9d04c0ed9650d16':
Rename AudioRecordConfiguration to AudioRecordingConfiguration
2016-03-07 19:53:33 +00:00
Jeff Tinker
a531724c88
Merge "Add error code to MediaCodec.CryptoException" into nyc-dev am: b849eeab26
...
am: d83f4fc837
* commit 'd83f4fc837cf344c81def1284aa1af8757703b3e':
Add error code to MediaCodec.CryptoException
2016-03-07 19:42:11 +00:00
Jean-Michel Trivi
46f5429768
Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev
2016-03-07 19:29:04 +00:00
Jeff Tinker
b849eeab26
Merge "Add error code to MediaCodec.CryptoException" into nyc-dev
2016-03-07 18:18:10 +00:00
Insun Kang
f2045ae751
Merge "Fix wrong metadata conversion in MediaSessionLegacyHelper" into nyc-dev am: bf8ff76fee
...
am: f6e1f29da9
* commit 'f6e1f29da9204a615fc7a201e811c7149ea645f7':
Fix wrong metadata conversion in MediaSessionLegacyHelper
2016-03-07 06:37:56 +00:00
Insun Kang
bf8ff76fee
Merge "Fix wrong metadata conversion in MediaSessionLegacyHelper" into nyc-dev
2016-03-07 06:31:22 +00:00
Jeff Sharkey
16ba77f20c
Merge "Set default ringtones through RingtoneManager." into nyc-dev am: 0f905b3db2
...
am: 6102dca518
* commit '6102dca518eda6cf39b68e61a650a268a04d1666':
Set default ringtones through RingtoneManager.
2016-03-06 01:00:54 +00:00
Jeff Sharkey
0f905b3db2
Merge "Set default ringtones through RingtoneManager." into nyc-dev
2016-03-06 00:50:20 +00:00
Jeff Sharkey
9dd3b2162d
Set default ringtones through RingtoneManager.
...
RingtoneManager is the public API that everyone should be going
through, and it now has the side-effect of caching the set ringtone
to make it available before CE storage is unlocked.
Bug: 27435331
Change-Id: I30ed4e2df2ef1e4fd47f947c70845aaa74356384
2016-03-05 17:43:22 -07:00
Jeff Sharkey
40e5feaf8f
Merge "Ask RingtonePlayer to open data for caching." into nyc-dev am: b94f2df289
...
am: 12e2778307
* commit '12e2778307f39564edf52ea94cecd577bfc3d1ee':
Ask RingtonePlayer to open data for caching.
2016-03-06 00:34:24 +00:00