4850 Commits

Author SHA1 Message Date
Jiabin Huang
2dc6cc9aa4 Merge "TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle)" into nyc-dev 2016-03-25 02:26:04 +00:00
Jaesung Chung
e468a67d59 Merge "ExifInterface: fix creating pointer tags which indicate 0 offset" into nyc-dev 2016-03-24 01:43:07 +00:00
Jiabin
d48d029da4 TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle)
Bug: 27762945
Change-Id: I7f9757f8ca1eb92f892fb2961717125c8b909663
2016-03-24 09:57:27 +09:00
Jaesung Chung
616a42f982 ExifInterface: fix creating pointer tags which indicate 0 offset
When saving attributes(that it writes JPEG again.), now ExifInterface
generates some uncessary pointer tags which refer to an empty EXIF IFD
group, that makes a warning message by ExifInterface when reading again,
which warns that the value of the pointer tag pointing to is invalid.

Bug: 27583378
Change-Id: Id0170c5644541565c98fe4978284098e6664c395
2016-03-23 10:22:48 -07:00
Jaesung Chung
976bbaccc4 Merge "ExifInterface: close the resource after reading EXIF data explicitly" into nyc-dev 2016-03-23 02:30:42 +00:00
Jaesung Chung
203ed4d500 Merge "ExifInterface: fix regression of re-writing JPEG" into nyc-dev 2016-03-23 02:30:29 +00:00
Jaesung Chung
c247791db2 ExifInterface: close the resource after reading EXIF data explicitly
- In case of giving an argument of the image file name or descriptor,
 we created a InputStream at the inside of ExifInterface, close them
 properly.
- Developers should take care of closing input streams when they use
 input streams since they made those input streams.

Bug: 27636804
Change-Id: I9a3a75b1b55dcb2718a60e14814a04cad939d22c
2016-03-22 19:20:29 -07:00
Jaesung Chung
42ac0d0015 ExifInterface: fix regression of re-writing JPEG
Bug: 27583378
Change-Id: I052dfedbb1393705eba378de5eaf3636ed0e65ea
2016-03-22 19:12:42 -07:00
Dongwon Kang
7b0864cc68 Merge "MediaResourceMonitor: Change argument type from string to int" into nyc-dev 2016-03-22 23:50:03 +00:00
Dongwon Kang
6d8587a81c MediaResourceMonitor: Change argument type from string to int
Bug: 27529962
Change-Id: I29c165ccf6b44b0ca6812f1ccae758d67b225e0d
2016-03-22 15:21:01 -07:00
Jaesung Chung
285bbbbda4 Merge "ExifInterface: fix logs" into nyc-dev 2016-03-22 05:39:27 +00:00
Jaesung Chung
f2a1076cd3 Merge "ExifInterface: fix writing STRING and SRATIONAL formats" into nyc-dev 2016-03-22 05:38:27 +00:00
Jaesung Chung
c2916968aa ExifInterface: fix logs
- Give more explanations on dealing with files failed to process.
- Log and return immediately when handling lost JPEG files.
- Minor fixes in logging.

Bug: 27583378, Bug: 27587980
Change-Id: Id9a3d137e5f173fa0e6313402e5dc482a5efd57c
2016-03-21 22:13:46 -07:00
Jeff Sharkey
8953147400 Merge "Mark even more Bundles as defusable." into nyc-dev 2016-03-21 21:10:14 +00:00
Phil Burk
566e7212ab Merge "Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO" into nyc-dev 2016-03-21 19:30:23 +00:00
Jeff Sharkey
f0ec2e0050 Mark even more Bundles as defusable.
Bug: 27766193
Change-Id: Ib027ac7b40c7a575a76f289faabde9655338865e
2016-03-21 12:37:57 -06:00
Phil Burk
621dbc8740 Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO
Prevent developers from using a channelMask that will fail.

Bug: 27721209
Change-Id: I87ad67caedaedf6ed2230165cb1687a2a0b74703
Signed-off-by: Phil Burk <philburk@google.com>
2016-03-21 11:15:02 -07:00
Paul McLean
455388bdb8 Fix a javadoc @see error
Bug: 26194337
Change-Id: I7945058e0948238e9b2be7e5d8a7dc3ac4d814dc
2016-03-21 09:50:18 -06:00
Jae Seo
3b9be6700f TIF: Annotate constants
Bug: 20980990
Change-Id: I3fac9f19cc705c9d94d2ff24075830f2d65588c8
2016-03-18 16:15:39 -07:00
Jaesung Chung
f9e0f20b28 Merge "ExifInterface: do not throw an Exception when XMP" into nyc-dev 2016-03-18 07:17:45 +00:00
Jaesung Chung
d1e20d2c7a ExifInterface: fix writing STRING and SRATIONAL formats
This CL makes ExifInterface determine the data format of rational
numbers and the values which include several components for exif entry
correctly.

Bug: 27614052
Change-Id: Ic3ea64889fad06ef5f636e4635ab7803a9c9ae29
2016-03-18 15:17:04 +09:00
Dongwon Kang
62b5ec7651 Merge "TIF: Remove TvInputManager.Session from system API" into nyc-dev 2016-03-17 22:01:04 +00:00
Dongwon Kang
841ad718c1 TIF: Remove TvInputManager.Session from system API
Originally this API is expected to be used some use cases which don't
fit TvView well. e.g. background recording. Removing this from system api
in favor of TvRecodingClient which is introduced in N.

Bug: 25726241
Change-Id: If45fc3e2c5382e7b9e8abf42effebd76fd84b25d
2016-03-17 13:08:18 -07:00
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
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
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
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