Commit Graph

5271 Commits

Author SHA1 Message Date
Robert Shih
a1c7483429 MediaExtractor: Javadoc should mention INTERNET permission
Bug: 10673034
Change-Id: Iea1196c76b09fa5b8f5b2d11a461eeb4c6578a1b
2016-07-20 17:46:11 -07:00
Lajos Molnar
77e3a344b7 Merge \\"media: document new temporal layering schema values.\\" into nyc-mr1-dev am: 12f860f5a2
am: 878069382e

Change-Id: Iffd7f35b5c6e53ddcc4728a422839298b13503da
2016-07-15 05:59:39 +00:00
Lajos Molnar
98d9779533 Merge \\"media: clarify MediaFormat.KEY_I_FRAME_INTERVAL\\" into nyc-mr1-dev am: 991c240a88
am: 525d917ac9

Change-Id: I6c5088ec6b2b7810acf2c3e6835b205f80eded06
2016-07-15 05:59:32 +00:00
Lajos Molnar
878069382e Merge \"media: document new temporal layering schema values.\" into nyc-mr1-dev
am: 12f860f5a2

Change-Id: Ifb3c99ca6e4b2a9dcec6d58afacbcba474ea4d73
2016-07-15 05:53:37 +00:00
Lajos Molnar
525d917ac9 Merge \"media: clarify MediaFormat.KEY_I_FRAME_INTERVAL\" into nyc-mr1-dev
am: 991c240a88

Change-Id: Id1e1bfdb65b10f5e7b99a0e164afc05ca2518dbf
2016-07-15 05:53:28 +00:00
Lajos Molnar
12f860f5a2 Merge "media: document new temporal layering schema values." into nyc-mr1-dev 2016-07-15 05:44:04 +00:00
Lajos Molnar
be00432071 media: clarify MediaFormat.KEY_I_FRAME_INTERVAL
Bug: 30096321
Change-Id: I908b669caf5443fb272a2d274b7cbf7227913b3e
2016-07-15 05:15:24 +00:00
Lajos Molnar
2cfca129d6 media: document new temporal layering schema values.
Also fix doc as these are advertised on the output port.

Bug: 30150921
Bug: 27596987
Change-Id: Ia95876ade36bc82eea0e9795dea0268abbd1c1ef
2016-07-14 19:56:35 -07:00
Lajos Molnar
cbf82bd3ab Merge \\"media: clarify notes in MediaCodec doc\\" into nyc-mr1-dev am: 82d886434d
am: 1d356c895b

Change-Id: I086a5de8bb581d5d908dacee82e4d93403e73320
2016-07-15 00:39:10 +00:00
Lajos Molnar
1d356c895b Merge \"media: clarify notes in MediaCodec doc\" into nyc-mr1-dev
am: 82d886434d

Change-Id: Iacc43f3db9a41a0373227fc09f3590cf275ec34f
2016-07-15 00:35:12 +00:00
Lajos Molnar
82d886434d Merge "media: clarify notes in MediaCodec doc" into nyc-mr1-dev 2016-07-15 00:25:30 +00:00
Wei Jia
7a963e183d Merge \\"Fix disabling lockscreen for demo users.\\" into nyc-mr1-dev am: 407fd1ea62
am: 3b098778c6

Change-Id: I66a5393837e3ec0286be28f766a603da844ce6fc
2016-07-13 23:31:10 +00:00
Sudheer Shanka
3b098778c6 Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev
am: 407fd1ea62

Change-Id: I5625a9ef9fd35ee0cbf6cad7651f7a39eee8f059
2016-07-13 23:15:03 +00:00
Wei Jia
407fd1ea62 Merge "MediaPlayer: fix typo for OnInfoListener." into nyc-mr1-dev 2016-07-13 22:05:00 +00:00
Jean-Michel Trivi
6e4d0a234a Merge \\"Optimize audio playback restriction check\\" into nyc-mr1-dev am: 69c6166684
am: 96a8ee3aec

Change-Id: I0b78ebbfe10a56d2ce27af0b9317de93e29e4c13
2016-07-13 22:03:02 +00:00
Jean-Michel Trivi
96a8ee3aec Merge \"Optimize audio playback restriction check\" into nyc-mr1-dev
am: 69c6166684

Change-Id: If626176f014e65f0248c5ae80d9196dd27076ec4
2016-07-13 21:57:24 +00:00
Jean-Michel Trivi
69c6166684 Merge "Optimize audio playback restriction check" into nyc-mr1-dev 2016-07-13 21:50:59 +00:00
Jean-Michel Trivi
1293c060c8 Optimize audio playback restriction check
Order the playback restriction checks from the most likely
  restriction to the least likely.

Bug 30073948

Change-Id: I6431d15a2ed8b5831f937eab8db940d942082b0e
2016-07-13 19:30:56 +00:00
Eric Laurent
a5a6a47e94 Merge \\"Make Dolby TrueHD audio format public\\" into nyc-mr1-dev am: eb8de29269
am: 50768af5e1

Change-Id: Id634ea390d59dc0f39b3ce1b5ce440f6aad54634
2016-07-13 16:06:14 +00:00
Eric Laurent
50768af5e1 Merge \"Make Dolby TrueHD audio format public\" into nyc-mr1-dev
am: eb8de29269

Change-Id: I2cfe7a072d7bdbce4a1fad357b1608c1f9624688
2016-07-13 16:01:29 +00:00
Eric Laurent
eb8de29269 Merge "Make Dolby TrueHD audio format public" into nyc-mr1-dev 2016-07-13 15:54:04 +00:00
Jin Park
ffe4efc319 ExifInterface: Add RAF file parse support
A RAF format file has a unique way of storing its data. This CL adds
code that checks whether a file is a RAF file format and parses the
data according to specifications.

Bug: 29409358
Change-Id: If37d4ba8de47cdbacd524a07148ba6c14f873259
2016-07-13 07:10:16 +00:00
Jin Seok Park
bc0f0f4351 Merge "ExifInterface: Extract primary image length/width values" 2016-07-13 07:08:55 +00:00
Jin Park
559c028fc8 ExifInterface: Extract primary image length/width values
The primary image may not contain the tags for ImageLength and
ImageWidth values if it uses the JFIF specification. This CL searches
the data to retrieve those necessary values.

Bug: 29409358
Change-Id: I850768af38b7b723e93833a70a2238f3fe1cc29b
2016-07-13 14:29:58 +09:00
Chris Thornton
c7777df526 Merge \\"SoundTriggerDetector should look at the return code to honour success\\" into nyc-mr1-dev am: 9b550cb188
am: 0359337b9b

Change-Id: Idabd2180b88dbb8cef6039825cdebaf3026eaf8d
2016-07-12 23:47:23 +00:00
Chris Thornton
0359337b9b Merge \"SoundTriggerDetector should look at the return code to honour success\" into nyc-mr1-dev
am: 9b550cb188

Change-Id: Iafbd6b758768fc0f87651ac9086333fa74e07fdc
2016-07-12 23:37:18 +00:00
Wei Jia
d973c00b4a MediaPlayer: fix typo for OnInfoListener.
Bug: 30099323
Change-Id: Ic59fe64b4d2b6dcf28d31cb7c480ba6cb7a4cea1
2016-07-12 14:38:50 -07:00
Rob Carr
5ddb26eace Merge "Remove unused SurfaceView state." 2016-07-12 21:20:02 +00:00
Chris Thornton
4ef887457a SoundTriggerDetector should look at the return code to honour success
The SoundTriggerDetector calls to start/stop recognition should also
check what the return code from the SoundTriggerService are saying -
otherwise it looks like recognition has started when there's been a
problem.

Change-Id: Icd6d2ab5ec30a5ffe66082311a77cca376a37148
2016-07-11 22:03:16 -07:00
Eric Laurent
a0762f9ce2 Merge \\"Add Dolby TrueHD audio format\\" into nyc-mr1-dev am: b2fe804064
am: 4b09c6bc9e

Change-Id: I364e4320e1f43e155285b06177730bf07c6e3bba
2016-07-12 01:32:37 +00:00
Eric Laurent
abda9c33e5 Make Dolby TrueHD audio format public
Bug: 30024357
Change-Id: I4e8e8cde6e6c87c96e07e1828da0fad96c0f9e76
2016-07-11 17:08:14 -07:00
Robert Carr
49b593efae Remove unused SurfaceView state.
Use progressively declined over N, until I noticed
they were no longer used at all.

Change-Id: I05db2e8569d26b69f91f753564ffa5f40aa05a61
2016-07-11 12:22:06 -07:00
TreeHugger Robot
e7d27dd2fc Merge "Add onTerminate runner to MtpServer." 2016-07-11 03:04:03 +00:00
TreeHugger Robot
ede2e7d822 Merge "Add @NonNull / @Nullable annotations to android.mtp API." 2016-07-11 02:29:12 +00:00
Daichi Hirono
f1d69ee247 Add onTerminate runner to MtpServer.
The CL adds onTerminate runner to MtpServer constructor's arguments to
know when MtpServer stops its thread.

BUG=29971895

Change-Id: I685ad6bc663f76e04ae3837129cbe12805d2093c
2016-07-11 10:15:41 +09:00
Eric Laurent
4b09c6bc9e Merge \"Add Dolby TrueHD audio format\" into nyc-mr1-dev
am: b2fe804064

Change-Id: I2eba2e118c6ce34299ffe894d2c6e6ef9140fa24
2016-07-08 23:13:13 +00:00
Eric Laurent
b2fe804064 Merge "Add Dolby TrueHD audio format" into nyc-mr1-dev 2016-07-08 23:08:02 +00:00
Jean-Michel Trivi
95a8724dff Merge \\\"More javadoc for audio recording activity API\\\" into nyc-dev am: 8d5fd92314 am: a90df50109
am: 7cd1622ca3

Change-Id: Ic2453ac826b5fc80a73b9a03d99c84cfd0132186
2016-07-08 20:03:58 +00:00
Jean-Michel Trivi
7cd1622ca3 Merge \\"More javadoc for audio recording activity API\\" into nyc-dev am: 8d5fd92314
am: a90df50109

Change-Id: I256b03cae0e76b7a5c61a691c9359a091f1f666a
2016-07-08 19:55:08 +00:00
Jean-Michel Trivi
ee0a01c8a6 Merge \"More javadoc for audio recording activity API\" into nyc-dev
am: 8d5fd92314

Change-Id: If513added909df2135fb57a2f86804edec821177
2016-07-08 19:49:09 +00:00
Jean-Michel Trivi
a90df50109 Merge \"More javadoc for audio recording activity API\" into nyc-dev
am: 8d5fd92314

Change-Id: I58f991a41a6d17ca8e854109dad6ab41b14bc65a
2016-07-08 19:45:54 +00:00
Jean-Michel Trivi
8d5fd92314 Merge "More javadoc for audio recording activity API" into nyc-dev 2016-07-08 19:36:33 +00:00
Daichi Hirono
0639fe0aa9 Add @NonNull / @Nullable annotations to android.mtp API.
BUG=26758882

Change-Id: Ic86d2253114b487d68a069f3e63f19b200d6cb97
2016-07-08 11:28:00 +09:00
Eric Laurent
b4fae5ba39 Add Dolby TrueHD audio format
Format is not public for now.
Unhide at next API bump.

Bug: 30024357
Change-Id: Ic307214d8ac8b7bb57609bf609366968efafd7cc
2016-07-07 18:58:11 -07:00
Eric Laurent
69ab143351 Merge \\\"SoundPool: fix enforced camera shutter sound\\\" into nyc-dev am: a2266f7a0f am: a165d12737
am: be50351b72

Change-Id: Ib25af848035f9bf1376c3c48506d9c5f882a9cb5
2016-07-07 21:08:03 +00:00
Eric Laurent
be50351b72 Merge \\"SoundPool: fix enforced camera shutter sound\\" into nyc-dev am: a2266f7a0f
am: a165d12737

Change-Id: I8e79a3f627ec38c736decdca2c88b56a4f5b5452
2016-07-07 20:57:54 +00:00
Eric Laurent
f638978b07 Merge \"SoundPool: fix enforced camera shutter sound\" into nyc-dev
am: a2266f7a0f

Change-Id: Ibb406207b55a532fdb42a68d0787b851deec8d05
2016-07-07 20:49:13 +00:00
Eric Laurent
a165d12737 Merge \"SoundPool: fix enforced camera shutter sound\" into nyc-dev
am: a2266f7a0f

Change-Id: I6ae2457bd8bd9f53b35373fb1be7eb66f80f1510
2016-07-07 20:46:20 +00:00
Eric Laurent
1913e5acc4 SoundPool: fix enforced camera shutter sound
Make sure that camera shutter sound is played in
total silence DND mode when enforced by country
regulation.

Bug: 29973005
Change-Id: I208f7ae5b07777eac48597f68feae6358999b2c3
2016-07-07 18:47:03 +00:00
Bryan Mawhinney
b5a1d80471 Merge \\"Make MediaScanner extract \\"date taken\\" from videos, if present\\" into nyc-mr1-dev am: d63dbfdb6b
am: 1cba847a71

Change-Id: I02937c5323fc6523b796cc6282ddc38a172b3fa0
2016-07-07 09:33:38 +00:00