Commit Graph

4992 Commits

Author SHA1 Message Date
Julia Reynolds
a6b0caf89a Merge "Relax policy access restriction for adjust volume changes." into nyc-dev 2016-03-17 19:08:15 +00:00
Hangyu Kuang
10bbe6aeae Merge "stagefright: Document that encoders are free to use available tools associated with the speficifed profile." into nyc-dev
am: aa8ba08

* commit 'aa8ba08c80481cb21caaaab7c8f3ea98db7855fd':
  stagefright: Document that encoders are free to use available tools associated with the speficifed profile.
2016-03-17 18:29:47 +00:00
Hangyu Kuang
aa8ba08c80 Merge "stagefright: Document that encoders are free to use available tools associated with the speficifed profile." into nyc-dev 2016-03-17 18:22:11 +00:00
Glenn Kasten
028f3aec79 Merge "Use audio_session_t consistently" into nyc-dev
am: 58ae278

* commit '58ae278294017abca0dffc95f006ae646c88db89':
  Use audio_session_t consistently
2016-03-17 18:01:57 +00:00
Jean-Michel Trivi
711a8b1d3c Merge "Dynamic audio policies: device type and address" into nyc-dev
am: 4003499

* commit '400349907ec5bb09887e5ba9f9cd1fa1f3d06716':
  Dynamic audio policies: device type and address
2016-03-17 17:35:11 +00:00
Julia Reynolds
cdaa0b99eb Relax policy access restriction for adjust volume changes.
Otherwise users can't enter DND while using volume buttons in most
apps.

Bug: 27711587
Change-Id: Idb4976680d9bb88206928a7b623f17d07183ea28
2016-03-17 13:28:31 -04:00
Bartosz Bialek
6bca637ea2 Merge "Do not scan a file which cannot be read" am: 258baa3
am: 3fc27c3

* commit '3fc27c3444e962776815f9bfbaedbc60a9f9571e':
  Do not scan a file which cannot be read
2016-03-17 15:50:36 +00:00
Marco Nelissen
2c37b515ee Merge "Remove the field of MediaDrm from inner class CryptoSession." 2016-03-17 15:43:32 +00:00
Marco Nelissen
258baa35c0 Merge "Do not scan a file which cannot be read" 2016-03-17 15:42:02 +00:00
Glenn Kasten
58ae278294 Merge "Use audio_session_t consistently" into nyc-dev 2016-03-17 14:22:53 +00:00
Jean-Michel Trivi
400349907e Merge "Dynamic audio policies: device type and address" into nyc-dev 2016-03-16 21:31:09 +00:00
Jean-Michel Trivi
4ad39885f2 Dynamic audio policies: device type and address
Store device type and address in audio mixes regardless of the
  mix route type, no "registration" field.
For LOOP_BACK mixes, assign the REMOTE_SUBMIX device type.

Bug 25448664

Change-Id: I8d59b2fd3e05b1dcf1081ad826f985f5e3e74769
2016-03-16 12:15:43 -07:00
Dongwon Kang
822ac7745a Merge "TIF: Unhide sendAppPrivateCommand/onAppPrivateCommand" into nyc-dev 2016-03-16 17:56:12 +00:00
Dongwon Kang
f714e62c12 TIF: Unhide sendAppPrivateCommand/onAppPrivateCommand
Bug: 25726685
Change-Id: Iad6417b4da0543043a7fa17287487313a7670209
2016-03-16 10:48:18 -07:00
Julia Reynolds
48034f89b7 Prevent apps without DND access from toggling DND via AudioService.
Bug: 25395278
Change-Id: Id72830607b01a43848d1261292e5835315ef70d0
2016-03-16 09:33:02 -04:00
Jaesung Chung
36a20cdde3 Merge "ExifInterface: ignore exceptions when getting wrong images" into nyc-dev 2016-03-15 23:27:13 +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
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
5fa031182b ExifInterface: do not throw an Exception when XMP
In JPEG, an APP1 section can contain EXIF or XMP. The old code throws an
Exception when XMP APP1 segment is showns.

Bug: 27580432
Change-Id: If42197ea0c33ec4446302c969b42afd3d4b4e3c3
2016-03-15 18:13:52 +09: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
Hangyu Kuang
5cbd0b84ac stagefright: Document that encoders are free to use available tools
associated with the speficifed profile.

Bug:27597166
Change-Id: I1437d29c49ddad4779c82baf76c81a0286fa93c8
2016-03-14 22:27:13 +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
Sungsoo Lim
88a03d6e62 MediaBrowser: Applying API Review
unsubscribe() should accept the Callback used to call subscribe()
as the identifying key for what to unsubscribe, not the options
Bundle used to call subscribe.

Bug: 27384292
Change-Id: I0a5664d35983fcbdb6f9e60fd35acac813daf0c7
2016-03-14 17:18:03 +09: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
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
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
Glenn Kasten
33b840444f Use audio_session_t consistently
Also prefer AudioManager.AUDIO_SESSION_ID_GENERATE over
AudioSystem.AUDIO_SESSION_ALLOCATE, because
AudioSystem.AUDIO_SESSION_ALLOCATE is @hide.

Bug: 27562099
Change-Id: I5924554feb919db7f2390f5b062faedd515421af
2016-03-10 10:35:49 -08: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
e834dd78d4 Merge "ExifInterface: fix a bug in readExifEntryValue" into nyc-dev 2016-03-10 04:26:52 +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
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
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
924dd55528 Merge "ImageReader/Writer: refactor and cleanup" into nyc-dev 2016-03-09 01:09: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
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
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