Commit Graph

4746 Commits

Author SHA1 Message Date
Jaesung Chung
a63516507f Merge "ExifInterface: ignore exceptions when getting wrong images" into nyc-dev am: 36a20cdde3
am: 6f9e502324

* commit '6f9e502324f5178ac8507c8446c6b65016e546cd':
  ExifInterface: ignore exceptions when getting wrong images
2016-03-15 23:37:29 +00:00
Jaesung Chung
36a20cdde3 Merge "ExifInterface: ignore exceptions when getting wrong images" into nyc-dev 2016-03-15 23:27:13 +00:00
Li Chen
c9e11dd6d5 Merge "Remove the field of MediaDrm from inner class CryptoSession." into nyc-dev am: 5a5d56b9ef
am: ef38255770

* commit 'ef38255770e0b9850b46a91b475a7720cdbf66d2':
  Remove the field of MediaDrm from inner class CryptoSession.
2016-03-15 17:11:03 +00:00
Jeff Tinker
5a5d56b9ef Merge "Remove the field of MediaDrm from inner class CryptoSession." into nyc-dev 2016-03-15 16:59:47 +00:00
Dongwon Kang
e92c891e30 Merge "TIF: Add annotations for the system APIs which requires permissions" into nyc-dev am: 49fd7f1d6e
am: 0473bf1ae7

* commit '0473bf1ae749da356fdaa8f55ee8f9dca0c7a60c':
  TIF: Add annotations for the system APIs which requires permissions
2016-03-15 14:57:24 +00:00
Dongwon Kang
49fd7f1d6e Merge "TIF: Add annotations for the system APIs which requires permissions" into nyc-dev 2016-03-15 14:50:48 +00:00
Dongwon Kang
89813b8162 TIF: Add annotations for the system APIs which requires permissions
Bug: 25726241
Change-Id: I2c1c8fb04c7299f9010c7f3ed0aca2e4f1e8b7bd
2016-03-15 07:49:53 -07:00
Jaesung Chung
ffc73482b0 Merge "ExifInterface: handle the invalid offsets and count numbers" into nyc-dev am: 1a506af9a2
am: 20694fa75e

* commit '20694fa75eac8b341a82fbf5fc410b92ca057cb0':
  ExifInterface: handle the invalid offsets and count numbers
2016-03-15 08:34:00 +00:00
Jaesung Chung
1a506af9a2 Merge "ExifInterface: handle the invalid offsets and count numbers" into nyc-dev 2016-03-15 08:27:38 +00:00
Jaesung Chung
49371caff0 ExifInterface: handle the invalid offsets and count numbers
Some JPEG images generated by various camera vendors have wrong offsets
and invalid numbers for indicating the size of components. Instead of
throwing exceptions, this CL makes Exifinterface ignore these cases to
read the information without losing contents already parsed.

Bug: 27583378
Change-Id: Ie8ee0bf49283ef519f4f31c5b8ba78ce3f82fe92
2016-03-15 17:26:42 +09:00
Paul McLean
0f4fed678f Merge "Native routing phase 4" into nyc-dev am: 3795330981
am: 9120998fa3

* commit '9120998fa31e7e021dd52da7db5b4709aa7196df':
  Native routing phase 4
2016-03-14 20:05:40 +00:00
Paul Mclean
3795330981 Merge "Native routing phase 4" into nyc-dev 2016-03-14 19:56:50 +00:00
Paul McLean
14b4e65aff Native routing phase 4
Allow Acquire before Realize

Bug: 23899814

Change-Id: I58ab80554893a7df31c3892c75d6bd57fea2b336
2016-03-14 13:50:04 -06:00
Jaesung Chung
1043f56185 ExifInterface: ignore exceptions when getting wrong images
In order to maintain compatibility with the old versions of
ExifInterface, non-JPEG image files, for instance, PNG, GIF and so on,
need to be handled by generating an empty result rather than throwing
an exception in the constructor. And corrupted JPG files also should be
handled in the same way.

Bug: 27587980
Change-Id: If33b63c683bfb672999d1abd370a8edf29932ac1
2016-03-14 15:16:47 +09:00
Jean-Michel Trivi
d17a105dec Merge "Dynamic audio policies: allow device passing for RENDER mixes" into nyc-dev am: a40c017ba2
am: aea5dc8b54

* commit 'aea5dc8b543d6c159d77ae28b864139474f439ea':
  Dynamic audio policies: allow device passing for RENDER mixes
2016-03-12 01:38:52 +00:00
Jean-Michel Trivi
e8924115f9 Dynamic audio policies: allow device passing for RENDER mixes
AudioMix: add system method for specifying an AudioDeviceInfo
 to be used by this mix. This only works for AudioMix
 instance with the RENDER route flag.
Previous dynamic policy implementation didn't enforce
 mix route flag check, but only supported LOOP_BACK,
 so make LOOP_BACK the default.
When a policy gets registered and the registration ID is
 set on each mix, for RENDER mixes use the device
 address for registration.

Bug 25448664

Change-Id: If5789d84ff4c4c25a6e81ba1513a39916220498a
2016-03-11 16:45:27 -08:00
Li Chen
21c998f1e9 Remove the field of MediaDrm from inner class CryptoSession.
As CryptoSession is an inner (non-static) class of MediaDrm,
it's not necessary to pass in a reference of MediaDrm while
creating a CryptoSession instance.


bug: 27607931

Change-Id: Ic3cc03f885d14bc8d93287c918e778550cc21b58
2016-03-11 16:35:06 +00:00
Lajos Molnar
384e8866f4 Merge "media: add MediaFormat.COLOR_ IntDefs" into nyc-dev am: 684aff1fce
am: 5f606bb046

* commit '5f606bb0463666eeb8b1bdd4971178149e739402':
  media: add MediaFormat.COLOR_ IntDefs
2016-03-11 01:56:59 +00:00
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
684aff1fce Merge "media: add MediaFormat.COLOR_ IntDefs" into nyc-dev 2016-03-11 01:44: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
b12d49bb1e media: add MediaFormat.COLOR_ IntDefs
Bug: 27383733
Change-Id: Idb50af5e700e979254b6533b62687555e14c5226
2016-03-08 20:38:10 -08: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