OSDN Git Service
Jean-Michel Trivi [Wed, 28 Jun 2017 21:44:02 +0000 (21:44 +0000)]
Merge "Audio policy: fix volume change on DEVICE_OUT_SPEAKER_SAFE" into oc-dr1-dev
am:
888fd19ac4
Change-Id: I2c14211333dc49f279f11efe7aa7afb942fc4f18
TreeHugger Robot [Wed, 28 Jun 2017 21:33:00 +0000 (21:33 +0000)]
Merge "Audio policy: fix volume change on DEVICE_OUT_SPEAKER_SAFE" into oc-dr1-dev
Yin-Chia Yeh [Wed, 28 Jun 2017 20:36:24 +0000 (20:36 +0000)]
Camera: fix camera status after HAL crash
am:
fad3228356
Change-Id: I84ed9d5adfb5e47e11bee6ce52fccee98d30e24c
Yin-Chia Yeh [Wed, 28 Jun 2017 02:04:48 +0000 (19:04 -0700)]
Camera: fix camera status after HAL crash
When camera HAL dies and cameraserver is still alive, make sure
we update camera status after HAL re-register itself.
Test: kill hal process and run camera app, CTS
Bug:
63058983
Change-Id: Iba7e6cbebb674994c905f7feb1776acc479b612f
Hangyu Kuang [Wed, 28 Jun 2017 16:51:40 +0000 (16:51 +0000)]
media: Globaly adjust timestamp to make sure all tracks' time are align
am:
4085508523
Change-Id: Ifcf7260d8a6f425800d08efb59ac15b64809d2c3
Hangyu Kuang [Fri, 23 Jun 2017 23:23:14 +0000 (16:23 -0700)]
media: Globaly adjust timestamp to make sure all tracks' time are align
This workaround should be removed once implement edit list.
Bug:
62533717
Test: Camera Recording
Change-Id: Id2eb0c3bcb829bb4e48336fada74c0bfc951b304
Andy Hung [Wed, 28 Jun 2017 04:23:58 +0000 (04:23 +0000)]
Merge "Fix IAAudioService interface" into oc-dr1-dev
am:
efa8da08f3
Change-Id: I58d1aef86c53bd5d128db847b5098e2a88adaa6f
Andy Hung [Wed, 28 Jun 2017 04:20:21 +0000 (04:20 +0000)]
Merge "Fix IAAudioService interface" into oc-dr1-dev
Jean-Michel Trivi [Wed, 28 Jun 2017 02:38:42 +0000 (19:38 -0700)]
Audio policy: fix volume change on DEVICE_OUT_SPEAKER_SAFE
When changing stream volume, compare given device and current device
for stream both as filtered through Volume::getDeviceForVolume.
This behavior matters for Android devices playing notifications and
ringtones on the AUDIO_DEVICE_OUT_SPEAKER_SAFE, which is filtered
out for volumes (see Volume.h for getDeviceForVolume() method).
Test: play a ringtone and modify volume with vol keys
Bug:
63004956
Change-Id: I139099f34e0ab091fd0ea761c75949656549f77a
Robert Shih [Wed, 28 Jun 2017 00:50:11 +0000 (00:50 +0000)]
Merge "MPEG4Writer: initialize track start time" into oc-dr1-dev
am:
22fd463e14
Change-Id: If1fc94a3462179a647e943e00288c5b3c45ea867
TreeHugger Robot [Wed, 28 Jun 2017 00:41:47 +0000 (00:41 +0000)]
Merge "MPEG4Writer: initialize track start time" into oc-dr1-dev
Andy Hung [Tue, 27 Jun 2017 23:17:40 +0000 (16:17 -0700)]
Fix IAAudioService interface
Do not call data.checkInterface(this) unless needed,
and properly handle invalid interface.
This prevents stripping the file descriptor from the dump()
binder call.
Test: adb shell dumpsys media.aaudio
Bug:
38396780
Change-Id: I14c847e098145f49d4d5732787d3cc435dd05226
Guang Zhu [Tue, 27 Jun 2017 07:45:40 +0000 (07:45 +0000)]
Merge "Revert "Fix parsing of gps location atom in mp4"" am:
66688d8836 am:
2df0533894
am:
caaf20de8e
Change-Id: Ia4d7f2933067bab27e6358aac3fc7080d828cc32
Guang Zhu [Tue, 27 Jun 2017 07:43:10 +0000 (07:43 +0000)]
Merge "Revert "Fix parsing of gps location atom in mp4"" am:
66688d8836
am:
2df0533894
Change-Id: I6a8a57d435ce888920cbdeb00b6e48c46a4f6d54
Guang Zhu [Tue, 27 Jun 2017 07:40:41 +0000 (07:40 +0000)]
Merge "Revert "Fix parsing of gps location atom in mp4""
am:
66688d8836
Change-Id: Ied910cce62fdbd3331b23c59b637007b89bc66d3
Guang Zhu [Tue, 27 Jun 2017 07:35:54 +0000 (07:35 +0000)]
Merge "Revert "Fix parsing of gps location atom in mp4""
Guang Zhu [Tue, 27 Jun 2017 05:24:17 +0000 (05:24 +0000)]
Revert "Fix parsing of gps location atom in mp4"
Bug:
63044552
This reverts commit
bd4bad2ce9780e546616f1425a0a5a4c939f7af1.
Change-Id: I1a0a6eec502adbf34d235a189b61f992b98634a4
Eric Laurent [Tue, 27 Jun 2017 01:22:21 +0000 (01:22 +0000)]
Merge "Set initial audio device for AudioTrack and AudioRecord" into oc-dr1-dev
am:
66feec9ff3
Change-Id: I415f753f94ccc8efbd5dcd6e918cfbef392f16d9
TreeHugger Robot [Tue, 27 Jun 2017 01:18:39 +0000 (01:18 +0000)]
Merge "Set initial audio device for AudioTrack and AudioRecord" into oc-dr1-dev
Marco Nelissen [Mon, 26 Jun 2017 22:13:30 +0000 (22:13 +0000)]
Merge "Fix parsing of gps location atom in mp4" am:
a803165abc am:
bedbdd6aed
am:
a9b8b708a1
Change-Id: Iee2d7965f970df64571be11a47a72b58f7013f4a
Tri Vo [Mon, 26 Jun 2017 22:12:47 +0000 (22:12 +0000)]
Merge "Rename audio_utils/conversion.h to mono_blend.h" am:
d3463e15be -s ours am:
0cd9a06871 -s ours
am:
3aa5feb387 -s ours
Change-Id: Ieb6f867621d5e594c27dce98c13ff87e6d324e4e
Marco Nelissen [Mon, 26 Jun 2017 22:11:36 +0000 (22:11 +0000)]
Merge "Fix parsing of gps location atom in mp4" am:
a803165abc
am:
bedbdd6aed
Change-Id: I8181bc01dd08cc65c3bba102a422bf3cee2b5762
Tri Vo [Mon, 26 Jun 2017 22:04:14 +0000 (22:04 +0000)]
Merge "Rename audio_utils/conversion.h to mono_blend.h" am:
d3463e15be -s ours
am:
0cd9a06871 -s ours
Change-Id: I14fa4b3fe4ca730f2480eac4112d3de449692a94
Marco Nelissen [Mon, 26 Jun 2017 21:59:06 +0000 (21:59 +0000)]
Merge "Fix parsing of gps location atom in mp4"
am:
a803165abc
Change-Id: Ib3f3de6d5ee317ca9e062b1c6d810deea1116201
Tri Vo [Mon, 26 Jun 2017 21:58:31 +0000 (21:58 +0000)]
Merge "Rename audio_utils/conversion.h to mono_blend.h"
am:
d3463e15be -s ours
Change-Id: I642a44e88075d004cf5c384ceea13363c2d6c31f
Treehugger Robot [Mon, 26 Jun 2017 21:28:14 +0000 (21:28 +0000)]
Merge "Fix parsing of gps location atom in mp4"
Tri Vo [Mon, 26 Jun 2017 20:35:01 +0000 (20:35 +0000)]
Merge "Rename audio_utils/conversion.h to mono_blend.h"
Steven Moreland [Mon, 26 Jun 2017 17:59:42 +0000 (17:59 +0000)]
Merge changes from topic 'fix-omx-dependencies' into oc-dr1-dev
am:
d4ef5f1eaf
Change-Id: I2ac3b9f8a5752412ef3cd873db3abcac2485d0c7
Steven Moreland [Mon, 26 Jun 2017 17:59:31 +0000 (17:59 +0000)]
Use vendor variant of libstagefright_foundation.
am:
cb316c7ecc
Change-Id: I9d37fbb24e0f984fd067dff1c24b336a2ee744dc
TreeHugger Robot [Mon, 26 Jun 2017 17:54:11 +0000 (17:54 +0000)]
Merge changes from topic 'fix-omx-dependencies' into oc-dr1-dev
* changes:
Fix OMX dependencies.
Use vendor variant of libstagefright_foundation.
Phil Burk [Mon, 26 Jun 2017 17:12:56 +0000 (17:12 +0000)]
Merge "AudioTrack: explain why FAST mixer denied" into oc-dr1-dev
am:
f7b279fbd4
Change-Id: Ifaa13dec6c61051913db3924285adbf0815cac64
Phil Burk [Mon, 26 Jun 2017 17:03:37 +0000 (17:03 +0000)]
Merge "AudioTrack: explain why FAST mixer denied" into oc-dr1-dev
Eric Laurent [Fri, 23 Jun 2017 00:17:09 +0000 (17:17 -0700)]
Set initial audio device for AudioTrack and AudioRecord
Bug:
62090113
Test: run AAudio test and verify a valid device is reported just
after opening playback or capture streams in legacy mode.
Merged-In: Ic8be42e1735690eb00c811ef0cb8b5abb36172d6
Change-Id: Ic8be42e1735690eb00c811ef0cb8b5abb36172d6
Glenn Kasten [Fri, 24 Feb 2017 00:53:58 +0000 (16:53 -0800)]
Rename audio_utils/conversion.h to mono_blend.h
There is only one function declared in that header file, and it is
mono_blend, so a more specific filename may be easier to understand.
Test: compiles OK
Merged-In: Ie2aec6c706b1822581b34d3702818b8200a1db8a
Change-Id: Ie2aec6c706b1822581b34d3702818b8200a1db8a
(cherry picked from commit
6bf707f4c0752643757a7389384817da41d34fab)
Steven Moreland [Thu, 8 Jun 2017 01:18:09 +0000 (18:18 -0700)]
Fix OMX dependencies.
Note, filed b/
62923763 to cleanup xmlparser includes.
Bug:
37343418
Test: builds with BOARD_VNDK_VERSION=current
Test: (sanity) YouTube on a device
Test: (sanity) Camera on a device
Test: (sanity) watch (part of a) movie on a device
Test: (sanity) YouTube on marlin
Test: (sanity) Camera on marlin
Test: (sanity) watch (part of a) movie on marlin
Test: (sanity) YouTube on angler
Test: (sanity) Camera on angler
Test: (sanity) watch (part of a) movie on angler
Change-Id: I461f999122da56cabb9d4d15b182899ced3b0120
Phil Burk [Sat, 24 Jun 2017 19:38:55 +0000 (19:38 +0000)]
aaudio: fix CTS for MMAP mode
am:
ec89b2e2f8
Change-Id: I99bf03cd6342537e59aef6c67b00f4b63a849268
Phil Burk [Tue, 20 Jun 2017 22:05:06 +0000 (15:05 -0700)]
aaudio: fix CTS for MMAP mode
Improve calculation of buffer capacity based on requested minimum.
Adjust timing of start() to reduce underflows.
Track ServiceEndpoints based on requested deviceId.
Fix getFramesRead() and flush() behavior.
Fix timeouts due to ClockModel lateness bug.
Misc cleanup.
Bug:
37755299
Test: test_aaudio.cpp
Change-Id: I637c16e87fbe14b6f28c60aeea0b9dfed965ecd0
Hangyu Kuang [Sat, 24 Jun 2017 03:45:28 +0000 (03:45 +0000)]
Merge "media: Signal no more frames to read in AudioSource" into oc-dr1-dev
am:
0d3c68179e
Change-Id: I2a25694d6bffc3782ac6799ae96d488075e2c955
TreeHugger Robot [Sat, 24 Jun 2017 03:28:45 +0000 (03:28 +0000)]
Merge "media: Signal no more frames to read in AudioSource" into oc-dr1-dev
Eric Laurent [Sat, 24 Jun 2017 01:35:57 +0000 (01:35 +0000)]
Merge "aaudio: implement IPlayer for MMAP playback streams" into oc-dr1-dev
am:
06797a2d83
Change-Id: I855bb6d9abd26831d451c2ebef70b847f123d27e
Phil Burk [Sat, 24 Jun 2017 01:35:24 +0000 (01:35 +0000)]
Merge "libaaudio: use shared library for tests and examples" into oc-dr1-dev
am:
00e2cbcf74
Change-Id: I1fce89982fcae3e4250207eba989bb370bd3077e
TreeHugger Robot [Sat, 24 Jun 2017 01:23:45 +0000 (01:23 +0000)]
Merge "aaudio: implement IPlayer for MMAP playback streams" into oc-dr1-dev
TreeHugger Robot [Sat, 24 Jun 2017 01:04:23 +0000 (01:04 +0000)]
Merge "libaaudio: use shared library for tests and examples" into oc-dr1-dev
Robert Shih [Fri, 23 Jun 2017 22:56:44 +0000 (15:56 -0700)]
MPEG4Writer: initialize track start time
Bug:
62914344
Test: adb shell monkey -p com.google.android.GoogleCamera \
-c android.intent.category.LAUNCHER \
--ignore-security-exceptions \
--monitor-native-crashes -s 389 -v -v -v 125000
Change-Id: Iea06969b47dd07a212018faadefad04b3f95719e
Android Build Merger (Role) [Fri, 23 Jun 2017 23:01:16 +0000 (23:01 +0000)]
Merge "Merge "Camera: Add debug messages for camera latency" into oc-dev am:
b4bec13dca am:
758b72d3f5" into oc-dr1-dev-plus-aosp
Shuzhen Wang [Fri, 23 Jun 2017 23:00:50 +0000 (23:00 +0000)]
Merge "Camera: Add debug messages for camera latency" into oc-dev am:
b4bec13dca
am:
db7b0a5eff
Change-Id: Ida5afe110c4b53679e1a3e66649bbf8bdfe190a9
Shuzhen Wang [Fri, 23 Jun 2017 23:00:50 +0000 (23:00 +0000)]
Merge "Camera: Add debug messages for camera latency" into oc-dev am:
b4bec13dca
am:
758b72d3f5
Change-Id: I4ec977e4b342bb118a65a9de02cbd97d6bbb9726
Shuzhen Wang [Fri, 23 Jun 2017 22:51:52 +0000 (22:51 +0000)]
Merge "Camera: Add debug messages for camera latency" into oc-dev
am:
b4bec13dca
Change-Id: Ib35c8b834b29b720ec84c034de900be611151e7a
Shuzhen Wang [Fri, 23 Jun 2017 22:51:51 +0000 (22:51 +0000)]
Merge "Camera: Add debug messages for camera latency" into oc-dev
am:
b4bec13dca
Change-Id: Ifac57b6f2e0ebd41e5dc375b49a687e403d839e7
TreeHugger Robot [Fri, 23 Jun 2017 22:41:44 +0000 (22:41 +0000)]
Merge "Camera: Add debug messages for camera latency" into oc-dev
Hangyu Kuang [Fri, 23 Jun 2017 20:09:26 +0000 (13:09 -0700)]
media: Signal no more frames to read in AudioSource
This will unblock the MediaCodecSource on reading the frame.
Bug:
62328917
Test: Camera recording.
Change-Id: I4fa67ad6a844c87e2be2733cb2d9a96def336196
Shuzhen Wang [Tue, 20 Jun 2017 23:16:04 +0000 (16:16 -0700)]
Camera: Add debug messages for camera latency
Log latency histogram of:
- processCaptureRequest call,
- dequeueBuffer call, and
- waiting time for handout count fall below max_buffers
Test: Camera CTS
Bug:
62651109
Change-Id: I5ee1cdb4139fa359f0887d6f6871884e28739340
Steven Moreland [Fri, 23 Jun 2017 00:11:15 +0000 (17:11 -0700)]
Use vendor variant of libstagefright_foundation.
Rather than having a lib called libstagefright_foundation and one
called libstagefright_foundation_vendor, we now just have one library
and the build system keeps track of the vendor APIs that are exposed.
Test: (sanity) boot device, watch (part of) DRM protected movie.
Change-Id: I49f1c557ae8f93092bad5314e0630583cc7dc710
Vijay Venkatraman [Fri, 23 Jun 2017 00:32:25 +0000 (00:32 +0000)]
Merge "Made libcamera_client export include dir" into oc-dr1-dev
am:
f0ba75d526
Change-Id: I6d22ec7f2c31372c7eb19387e81a5510afd42058
Vijay Venkatraman [Fri, 23 Jun 2017 00:29:20 +0000 (00:29 +0000)]
Merge "Made libcamera_client export include dir" into oc-dr1-dev
Tomasz Wasilczyk [Thu, 22 Jun 2017 23:37:01 +0000 (23:37 +0000)]
Fix null pointer dereference. am:
d0b096052c
am:
839447ca0e
Change-Id: I3a8a1d0e89a196d34947c943958c201bcf932638
Tomasz Wasilczyk [Thu, 22 Jun 2017 23:33:01 +0000 (23:33 +0000)]
Fix null pointer dereference. am:
d0b096052c
am:
f3904e09a6
Change-Id: I247cd6b1f7571a3a52ec70bd730b72148cd18fe2
Tomasz Wasilczyk [Thu, 22 Jun 2017 23:29:00 +0000 (23:29 +0000)]
Fix null pointer dereference.
am:
d0b096052c
Change-Id: Ic11440f05d9b9ba81dded634b417a0b13bf3653b
Tomasz Wasilczyk [Thu, 22 Jun 2017 23:29:00 +0000 (23:29 +0000)]
Fix null pointer dereference.
am:
d0b096052c
Change-Id: I0a9858e8351742a5e440fd2aa886b12ede0b433e
Phil Burk [Thu, 22 Jun 2017 23:26:36 +0000 (16:26 -0700)]
libaaudio: use shared library for tests and examples
They were statically linking with libaaudio.
Bug:
62820459
Test: mmm frameworks/av/media/libaaudio
Change-Id: Ie704dd6c9d12b00c3f16f30d296468c9b5b42776
Phil Burk [Thu, 22 Jun 2017 23:04:00 +0000 (23:04 +0000)]
Merge "aaudio: add validation to improve security" into oc-dr1-dev
am:
366393ba0a
Change-Id: If9df3c09c1aa2116b6b99ab780a5aa72b67c2b99
TreeHugger Robot [Thu, 22 Jun 2017 22:53:40 +0000 (22:53 +0000)]
Merge "aaudio: add validation to improve security" into oc-dr1-dev
Phil Burk [Fri, 26 May 2017 23:05:02 +0000 (16:05 -0700)]
aaudio: add validation to improve security
Check for obviously bad values to prevent common exploits.
Bug:
38205290
Test: CTS test_aaudio.cpp
Change-Id: Ic650dbfbcbb9b87a89aae080ee72910ab2c9409b
Signed-off-by: Phil Burk <philburk@google.com>
Tomasz Wasilczyk [Thu, 22 Jun 2017 20:27:11 +0000 (13:27 -0700)]
Fix null pointer dereference.
Bug: b/
62282239
Test: vendor verified it
Change-Id: I9d8560f07044c83f6ab58ef534514061f900319e
Phil Burk [Fri, 16 Jun 2017 19:19:42 +0000 (12:19 -0700)]
AudioTrack: explain why FAST mixer denied
Also for AudioRecord
Bug:
62692443
Test: write_sine.cpp
Change-Id: I5b281476af4703798129df66584d813b9a8db8bb
Signed-off-by: Phil Burk <philburk@google.com>
Eric Laurent [Thu, 22 Jun 2017 01:51:47 +0000 (18:51 -0700)]
aaudio: implement IPlayer for MMAP playback streams
Make AudioStreamInternal derive from PlayerBase to
provide playback and volume control via IPlayer interface.
Bug:
62027849
Test: verify aaudio playback in MMAP mode and registration of aaudio
players in AudioService when active
Change-Id: Ia0878d46637c0a954d8a6259868a2d3bccf19119
Haynes Mathew George [Wed, 21 Jun 2017 20:56:33 +0000 (20:56 +0000)]
Merge "APM: Allow VOIP_TX input selection" into oc-dr1-dev
am:
cb815c959f
Change-Id: I84ea8b2c51e999a1f4845f653f6b9e1dfdb9c63b
TreeHugger Robot [Wed, 21 Jun 2017 20:50:20 +0000 (20:50 +0000)]
Merge "APM: Allow VOIP_TX input selection" into oc-dr1-dev
Marco Nelissen [Wed, 21 Jun 2017 17:55:18 +0000 (17:55 +0000)]
Merge "Fix tiny memory leak" am:
84f7e6acb9 am:
112af391b2
am:
7f08b552a5
Change-Id: I77e9c7f4df82637c7cd3d4d629eb389941c01b5e
Marco Nelissen [Wed, 21 Jun 2017 17:52:48 +0000 (17:52 +0000)]
Merge "Fix tiny memory leak" am:
84f7e6acb9
am:
112af391b2
Change-Id: I76cae10e3a2b894add6dd4479d8cced8db5f7cd3
Marco Nelissen [Wed, 21 Jun 2017 17:50:05 +0000 (17:50 +0000)]
Merge "Fix tiny memory leak"
am:
84f7e6acb9
Change-Id: Ie060723c5336dd166c3cbdf4d19ede7f7bbab3f2
Marco Nelissen [Tue, 20 Jun 2017 17:49:42 +0000 (10:49 -0700)]
Fix parsing of gps location atom in mp4
Allow for missing trailing slash and longer strings, validate
string length.
Bug:
62802112
Test: manual
Change-Id: Ief32fb1aff925fe80d636b811beed3c2362bbf01
Marco Nelissen [Wed, 21 Jun 2017 17:38:51 +0000 (17:38 +0000)]
Merge "Fix tiny memory leak"
Android Build Merger (Role) [Wed, 21 Jun 2017 17:06:06 +0000 (17:06 +0000)]
Merge "Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762 am:
f36fb2deb3 am:
25c4535f04 am:
b866f43754 am:
7a22cc8944 am:
4226c955b6 am:
ffd80b92df" into oc-dr1-dev-plus-aosp
Venkatarama Avadhani [Wed, 21 Jun 2017 17:05:47 +0000 (17:05 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762 am:
f36fb2deb3 am:
25c4535f04 am:
b866f43754 am:
7a22cc8944 am:
4226c955b6
am:
ffd80b92df
Change-Id: I87d2e73b47f5e8fbec2e2f4878d4a3882e07156a
Venkatarama Avadhani [Wed, 21 Jun 2017 17:05:45 +0000 (17:05 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762 am:
f36fb2deb3 am:
25c4535f04 am:
b866f43754 am:
7a22cc8944 am:
4226c955b6
am:
5db07aaab9
Change-Id: I536ec5b47c66636b094fdd6a629c7a406a67c56a
Venkatarama Avadhani [Wed, 21 Jun 2017 17:02:47 +0000 (17:02 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762 am:
f36fb2deb3 am:
25c4535f04 am:
b866f43754 am:
7a22cc8944
am:
4226c955b6
Change-Id: I38d98f41e46e62a2a1a1c660ebf1faec58a1d848
Venkatarama Avadhani [Wed, 21 Jun 2017 17:02:46 +0000 (17:02 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762 am:
f36fb2deb3 am:
25c4535f04 am:
b866f43754 am:
7a22cc8944
am:
4226c955b6
Change-Id: If43d207f376ff9af9ae63644ce9359a244988f7f
Venkatarama Avadhani [Wed, 21 Jun 2017 17:00:18 +0000 (17:00 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762 am:
f36fb2deb3 am:
25c4535f04 am:
b866f43754
am:
7a22cc8944
Change-Id: Idd82dbb633faaef7e78fb2d1082b91269926e675
Venkatarama Avadhani [Wed, 21 Jun 2017 16:57:45 +0000 (16:57 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762 am:
f36fb2deb3 am:
25c4535f04
am:
b866f43754
Change-Id: I4c3070b63449a82ebcb6a2053c9bc1c1563c1787
Venkatarama Avadhani [Wed, 21 Jun 2017 16:54:44 +0000 (16:54 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762 am:
f36fb2deb3
am:
25c4535f04
Change-Id: I0b085ef570fdd3a9f9a61428e6ea66ec98bdf6cd
Venkatarama Avadhani [Wed, 21 Jun 2017 16:52:13 +0000 (16:52 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762
am:
f36fb2deb3
Change-Id: Ie0786d3f1896e42c9ee879e3f43943641bc503b1
Venkatarama Avadhani [Wed, 21 Jun 2017 16:49:43 +0000 (16:49 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51
am:
b56bc9e762
Change-Id: Id27edb4426a7c4c2fad7bac2582663667d58ad75
Venkatarama Avadhani [Wed, 21 Jun 2017 16:46:43 +0000 (16:46 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f
am:
4ff3666a51
Change-Id: Ide20e7836e3feff6eb5aa7ce5c533277af243b6b
Venkatarama Avadhani [Wed, 21 Jun 2017 16:44:12 +0000 (16:44 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3
am:
1c0389cc5f
Change-Id: I1331b4b2263d956de7de7e882cf38d4ddb743a8b
Venkatarama Avadhani [Wed, 21 Jun 2017 16:41:12 +0000 (16:41 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7
am:
a16f5a1fb3
Change-Id: Id5c3640af7130aeadf6e5f810cdb2f79690a6428
Venkatarama Avadhani [Wed, 21 Jun 2017 16:38:41 +0000 (16:38 +0000)]
Change MPEG2 reinit Error Handling
am:
a67eacace7
Change-Id: I7ba8378fe66c57f595fee2368408cc426d3e5eaf
Venkatarama Avadhani [Tue, 30 May 2017 10:31:11 +0000 (16:01 +0530)]
Change MPEG2 reinit Error Handling
Changing reinit handling to not notify error in case init fails.
Bug:
37237396
Test: ran poc before/after on nyc-mr2
Change-Id: I694a9d2ccee7622d9c736efac12c9ec8639911f4
Haynes Mathew George [Tue, 20 Jun 2017 03:01:57 +0000 (20:01 -0700)]
APM: Allow VOIP_TX input selection
Set flag to select VOIP_TX input profile if input source
is VOICE_COMMUNICATION and phone state is MODE_IN_COMMUNICATION
Bug:
62495679
Test: Hangout call
Change-Id: I3b1bb9fbcdd5687ebb002facf0684983333e9a53
Eric Laurent [Tue, 20 Jun 2017 17:19:16 +0000 (17:19 +0000)]
Merge "audio policy config: add USB_HEADSET device" into oc-dr1-dev
am:
10c94f7a68
Change-Id: Ie62d2dfb45057ddea806092731152eee4f1889eb
TreeHugger Robot [Tue, 20 Jun 2017 17:10:15 +0000 (17:10 +0000)]
Merge "audio policy config: add USB_HEADSET device" into oc-dr1-dev
Jiyong Park [Tue, 20 Jun 2017 09:08:15 +0000 (09:08 +0000)]
DO NOT MERGE: fix build error caused by incorrect path of RemoteDataSource.h
am:
f64ced003d -s ours
Change-Id: Ib65400ffa1df5ad4c8a611387eeddfd034ff39a8
Jiyong Park [Tue, 20 Jun 2017 08:22:09 +0000 (17:22 +0900)]
DO NOT MERGE: fix build error caused by incorrect path of RemoteDataSource.h
The header should be under the media/stagefright subdir.
Test: m -j on aosp_fugu
Test: m -j dist platform-java tests on aosp_fugu
Change-Id: I3def467d90173b052a6aec391ca089c091c665b5
Merged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
Jiyong Park [Tue, 20 Jun 2017 06:53:08 +0000 (06:53 +0000)]
DO NOT MERGE: fix build error by moving remaining header files
am:
21c2d3dd09 -s ours
Change-Id: Icb77ef998809b27c70362bd73ef6ca2c688f55d8
Jiyong Park [Tue, 20 Jun 2017 06:45:58 +0000 (15:45 +0900)]
DO NOT MERGE: fix build error by moving remaining header files
The four header files were not moved as they don't exist in aosp/master.
Test: m -j
Merged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
Change-Id: I578385276204601f78c86fc773ea88a535c9caea
Jiyong Park [Tue, 20 Jun 2017 06:03:03 +0000 (06:03 +0000)]
DO NOT MERGE: fix build error due to duplicated fields in Android.bp
am:
21f2422857 -s ours
Change-Id: I551916f7226dae58d60863b716c9ffeb85b367cd
Jiyong Park [Tue, 20 Jun 2017 05:54:53 +0000 (14:54 +0900)]
DO NOT MERGE: fix build error due to duplicated fields in Android.bp
Test: m -j
Merged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
Change-Id: I203c9a8530f2232959e25ebdfc2aea63c98b3f9f
Jiyong Park [Tue, 20 Jun 2017 04:50:36 +0000 (04:50 +0000)]
Merge changes from topic 'vendor_available_libeffects' am:
82289efbd8 am:
467023e4a3 -s ours
am:
ab5efd5c46 -s ours
Change-Id: I3dec5414d4ddad48ac0b1376301e0a9e8b77c778
Jiyong Park [Tue, 20 Jun 2017 04:50:02 +0000 (04:50 +0000)]
DO NOT MERGE: Merge commit '
89f1f99d646fc6fbe72edc0d3f48d628543dd841' into manual_merge_89f1f99d64
am:
bd5609f0a3 -s ours
Change-Id: I11520624e612cb80ae2ea321d3e76e2a60223581
Jiyong Park [Tue, 20 Jun 2017 04:49:53 +0000 (04:49 +0000)]
provide libstagefright_foundation_vendor to vendors
am:
4c86beec46
Change-Id: I23091c3e8ddf8de2e031caf2949171adb859ad8a
OSDN Git Service
