11491 Commits

Author SHA1 Message Date
Shuzhen Wang
461f767606 Merge "Camera2: Add onCaptureQueueEmpty callback" 2016-10-20 21:36:16 +00:00
Shuzhen Wang
88f1af2410 Camera2: Add onCaptureQueueEmpty callback
onCaptureQueueEmpty indicates that the non-repeating
capture request queue of camera device is empty, and
is ready to process a new request.

Test: testMultipleCapture in PerformanceTest.java

Bug: 29006447
Change-Id: If245ff6abf352548ca13a10fcfbd1550b92c1224
2016-10-18 17:50:17 -07:00
Andy Hung
0564ec9d68 resolve merge conflicts of ffe502b to cw-f-dev am: 3dd656c624
am: c6e0d5f125

Change-Id: I80b908142bb4dbd2af8c9f3627ecfd5e3df1963c
2016-10-18 20:18:05 +00:00
Andy Hung
c6e0d5f125 resolve merge conflicts of ffe502b to cw-f-dev
am: 3dd656c624

Change-Id: I8217da44238234d4ba4c34ea76f5bd78fd7b87d2
2016-10-18 20:11:21 +00:00
Andy Hung
3dd656c624 resolve merge conflicts of ffe502b to cw-f-dev
Change-Id: Id392b2e1990dc50b5d2d552f283a11a648d849a1
2016-10-18 11:55:04 -07:00
Sungsoo
9a052fd590 ExifInterfaceTest: Catch IOException am: c9ed3b8a5b am: a4ec9714b3 am: b6f40a84fa am: 815d687215
am: 4090df5b63

Change-Id: If0c1922b0563c8723704e78609f0d7d8e21fb957
2016-10-18 18:03:20 +00:00
Sungsoo
4090df5b63 ExifInterfaceTest: Catch IOException am: c9ed3b8a5b am: a4ec9714b3 am: b6f40a84fa
am: 815d687215

Change-Id: I7a1f157a59f342dfbe8c9b08f387e121d781280a
2016-10-18 17:55:20 +00:00
Sungsoo
815d687215 ExifInterfaceTest: Catch IOException am: c9ed3b8a5b am: a4ec9714b3
am: b6f40a84fa

Change-Id: Ia9dbb060111c198774843f753977879f362bf904
2016-10-18 17:47:51 +00:00
Sungsoo
b6f40a84fa ExifInterfaceTest: Catch IOException am: c9ed3b8a5b
am: a4ec9714b3

Change-Id: I32a0cd6b1a58a697f108f37e0f036e55c9df9e17
2016-10-18 17:42:01 +00:00
Sungsoo
a4ec9714b3 ExifInterfaceTest: Catch IOException
am: c9ed3b8a5b

Change-Id: I589c7be846a9043ab0a7bbfb5e7775e9e595c0fd
2016-10-18 17:31:12 +00:00
Sungsoo
c9ed3b8a5b ExifInterfaceTest: Catch IOException
ExifInterface throws IOException instead of UnsupportedOperationException.

Bug: 32221877
Change-Id: I68a4a62f565a386434b774759271bf6f2af2b7db
2016-10-19 01:26:37 +09:00
Andy Hung
ffe502bd61 Ringtone: clear the MediaPlayer listener upon completion
This breaks a local refcount cycle and allows the Java gc to finalize
the Ringtone and MediaPlayer objects quickly.

Bug: 31811091
Change-Id: I0e5a4a78fdc02cc0c8b7811a1f1a45db3c90a0ff
2016-10-17 18:12:35 -07:00
Mikhail Naganov
c7555a0871 Merge "Split audio effects headers" 2016-10-17 22:22:52 +00:00
Philip P. Moltmann
b828b77985 Properly close USB device connection in Mtp device
Test: Built
Fixes: 32073045
Change-Id: I05179377532c1bd4dff1f4a4e0e837cb645317e3
2016-10-17 11:19:58 -07:00
Mikhail Naganov
49cc2c8483 Split audio effects headers
There can be different use cases with the code that imports
headers from audio_effects (each subsequent case is a more
specialized version of the previous one):

  1. The code only needs access to general structures
     like effect_descriptor_t:
     ==> include system/audio_effect.h
     Example: AudioSystem in libmedia

  2. The code that needs access to effect UUID and parameter
     enums:
     ==> include system/audio_effects/effect_foo.h
     Examples: media framework effects interfaces, libwilhelm

  3. The code that needs to call into HAL:
     ==> include hardware/audio_effect.h
     Examples: libaudiohal (implementation part) and libeffects

  4. The code that implements a particular effect:
     ==> include audio_effects/effect_foo.h
     Examples: cts/.../CTSTestEffect.cpp
               stuff in hardware/, vendor/

Change-Id: I201dfa20ddc7aac797fd35934c0f06658f1e60be
Test: make
2016-10-14 15:31:35 -07:00
Marco Nelissen
e1a81fcc65 Make AmrInputStream use MediaCodec
Bug: 32114618
Test: ran CTS test
Change-Id: I9fe77689bf0bcd1bc8f6c5a4d62135271c7bef8b
2016-10-14 14:52:10 +00:00
TreeHugger Robot
1bbdac5eb2 Merge "resolve merge conflicts of 3fc6b8f to master" 2016-10-14 02:50:58 +00:00
Sungsoo
4d3a4132c2 resolve merge conflicts of 3fc6b8f to master
Change-Id: I004b34699fd997805d6c37753c48fe1f1d226095
2016-10-14 08:17:19 +09:00
Sungsoo
3fc6b8fd0f ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510 am: 36f64a2f0c
am: b68d0855c4

Change-Id: I40df333d3b19911be333e5c466dfe01a3db4bd70
2016-10-13 22:21:47 +00:00
Sungsoo
b68d0855c4 ExifInterface: Provide backward compatibility am: 2dbe166801 am: bc813cd510
am: 36f64a2f0c

Change-Id: Ibc82a2ddd80dff7d98880db0a179fbb1540ac6f8
2016-10-13 22:11:58 +00:00
Sungsoo
36f64a2f0c ExifInterface: Provide backward compatibility am: 2dbe166801
am: bc813cd510

Change-Id: I0aa6d33baeec8dd991561d964bfce16915c0553d
2016-10-13 22:06:01 +00:00
Sungsoo
bc813cd510 ExifInterface: Provide backward compatibility
am: 2dbe166801

Change-Id: I53f2bfb056d955c6693cb65c9cb9a21859ff7535
2016-10-13 21:57:22 +00:00
Jean-Michel Trivi
46d5b820d7 Audio stream types: javadoc fix to indicate they're for volume
Fix javadoc for stream types to indicate they are only used for
  volume, not to identify streams of audio.
Do not reference AudioSystem in SDK doc.

Test: make offline-sdk-docs

Change-Id: Id7b84db1f22841c47e9d580c9f71f7765c498b9d
2016-10-13 21:38:44 +00:00
Sungsoo
2dbe166801 ExifInterface: Provide backward compatibility
ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.

Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Ifb478db3af820eb846c5373d3a284367da3495a0
2016-10-13 13:06:24 +09:00
Erik Wolsheimer
fdc44dc732 Fix memory leak in Ringtone am: 76ed4ddca0
am: 8d135d53cc

Change-Id: Ieed5a2e27ba53142ceb02a4e6812509beaabb414
2016-10-11 18:31:32 +00:00
Erik Wolsheimer
8d135d53cc Fix memory leak in Ringtone
am: 76ed4ddca0

Change-Id: I7c1167593ba2cc960dbb0b57385c574f5c22f2ad
2016-10-11 18:25:39 +00:00
Erik Wolsheimer
76ed4ddca0 Fix memory leak in Ringtone
BUG: 31938615
Change-Id: Ic736f3494b4da95460bdc0cb7857cc9fcc746ab9
2016-10-11 10:13:23 -07:00
Philip P. Moltmann
7db3055bba Do not access MTP devices when disabled. am: 5201f1e61c
am: c950703424

Change-Id: I9fdf980a9f60ae97eab64019b6f8e7f5b0e67e2b
2016-10-06 20:05:48 +00:00
Neil Fuller
b0ed2aa01b resolve merge conflicts of 3649f7c to master
Change-Id: Ic16950f1c50f7d06d3c9ae08a6f28e292b89c20f
2016-10-06 11:23:06 +01:00
Neil Fuller
3649f7cb70 Merge "Remove .mk lines that are just setting the default" am: 8873c3821d am: 6a3c315b25
am: c611842e1c

Change-Id: Ib71490ac084c706b53ae83278f3f8fcd302fc0f2
2016-10-06 08:49:37 +00:00
Neil Fuller
c611842e1c Merge "Remove .mk lines that are just setting the default" am: 8873c3821d
am: 6a3c315b25

Change-Id: I24bd59700cd8b362691115e725cbf11e6accdedc
2016-10-06 08:43:42 +00:00
Neil Fuller
8873c3821d Merge "Remove .mk lines that are just setting the default" 2016-10-06 08:31:34 +00:00
Glenn Kasten
5608a200ca Merge "Use AUDIO_IO_HANDLE_NONE instead of 0" 2016-10-05 17:35:37 +00:00
Neil Fuller
b04b5f697d Remove .mk lines that are just setting the default
1.8 is now the default unless targeting an old SDK.

Bug: 31944681
Test: make checkbuild
Change-Id: Ic8a50cfd332da8b84eb87207a3c2d2c9a9a58e99
2016-10-05 13:38:36 +01:00
Hangyu Kuang
6c08cfff6b Merge "media: Unhide mpeg2ts format for streaming output format support." 2016-10-04 17:10:23 +00:00
Colin Cross
a543ca6c05 Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584 am: 6d0b466935 am: 95311818f0
am: e9b5b70114

Change-Id: I80205377a19c45927a11fc14ab72c13a7479570b
2016-10-03 20:35:12 +00:00
Colin Cross
e9b5b70114 Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584 am: 6d0b466935
am: 95311818f0

Change-Id: I45b57d37d08699afc070699d07485cb83c51850a
2016-10-03 20:32:01 +00:00
Colin Cross
95311818f0 Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584
am: 6d0b466935

Change-Id: I9602684e0ac91f7c08dafe70309433bb233ceeaf
2016-10-03 20:27:46 +00:00
Colin Cross
08f5f1f03a Fix struct vs. class mismatch in forward definitions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.

Bug: 31752268
Test: m -j
Change-Id: Ib7227295e7b94c79cdc52e19c71be4066a11cedc
2016-09-30 21:07:26 -07:00
Mikhail Naganov
1fefc3c75f Merge "MIDI: fix building of properties for the native side" 2016-10-01 01:11:14 +00:00
Philip P. Moltmann
5201f1e61c Do not access MTP devices when disabled.
The USB data transfer is disabled we should not allow access MTP devices
(e.g.
usb sticks). We have two ways of accessing them: Either by mounting them
or by creating a MTPDevice in an app.

Of course an app could implement implement their own MTPDevice
implementation. In this case we cannot enforce the policy without
completely suppressing all MTP USB devices which would be too
restrictive.

Note: When the policy is set we do _not_ disconnect already connected
MTP devices

Fixes: 31472955
Change-Id: I6080c48c49657102774b2b3b4d89ff030245a266
2016-09-30 22:24:23 +00:00
Hangyu Kuang
5b168a0c54 media: Unhide mpeg2ts format for streaming output format support.
Test: Run the camera recorder and output correct mpeg2ts stream.

Bug: 21620607
Change-Id: Ic79758d568e984d55e822d4b6af8716b856dd7da
2016-09-30 13:25:22 -07:00
Wonsik Kim
4273dd03a8 MediaCodec refactoring part 1-a: buffers become separate class
MediaCodecBuffer is meant to replace ABuffer and MediaBuffer in
communication between framework components. As the first step, replace
use of ABuffer in MediaCodec with MediaCodecBuffer, and adjust related
classes accordingly.

MediaCodec.getBuffer() and related APIs now returns MediaCodecBuffers;
thus change MediaCodec clients to use MediaCodecBuffer accordingly.

Test: manually tested for key use cases (Camera, YouTube and Play Movies)
Change-Id: Iba7ce131645e75ce5ddbf497fb793ab38b7f245b
2016-09-30 20:07:04 +09:00
Mikhail Naganov
33603ae9c5 MIDI: fix building of properties for the native side
A couple of MIDI device's properties (related to ALSA) are of int type
and can't be transferred as a string. Fixed the code.

As we whitelist properties that can go into native, there is no need to
expect other type of properties besides ints and strings.

Bug: 25945784
Change-Id: I008731d0ffee60c31be0bfddb15dcd1425e4b88e
Test: using a PoC app
2016-09-29 17:15:22 -07:00
TreeHugger Robot
a92a8cf905 Merge "[RingtoneManager] Remove user id from internal Uri" 2016-09-29 14:03:36 +00:00
Andre Lago
760d27149d [RingtoneManager] Remove user id from internal Uri
Prevent system ringtones from leaking with user id's on them

Test: manual
Change-Id: Ia4492c75211f9637e075450763f201bf24c5bf03
2016-09-29 13:19:21 +01:00
Sungsoo
909371b6f6 Make dispatchAudioRoutesChanged be called when BT A2DP status changed am: 71f3563c39 am: 139f1e3742
am: 220f348fb3

Change-Id: I34ebeddffe313747008ed6f7d941097bd67d7b9b
2016-09-29 11:27:02 +00:00
Sungsoo
69e48e6181 Revert "Disable selecting the default audio route when a BT route is avaiable" am: fa6f70e225 am: 96942eb2ef
am: 727ecf0264

Change-Id: I104fb3405e1841a2120edd546c55b28b85e02550
2016-09-29 11:26:11 +00:00
Sungsoo
220f348fb3 Make dispatchAudioRoutesChanged be called when BT A2DP status changed am: 71f3563c39
am: 139f1e3742

Change-Id: I381779ef9ac0d285a35984b3e92948edb7a3fa8e
2016-09-29 11:17:52 +00:00
Sungsoo
727ecf0264 Revert "Disable selecting the default audio route when a BT route is avaiable" am: fa6f70e225
am: 96942eb2ef

Change-Id: Ic6a882104fd7e78886dd0e241a548a94141c653e
2016-09-29 11:17:09 +00:00