OSDN Git Service
Eino-Ville Talvala [Tue, 23 Oct 2012 17:36:05 +0000 (10:36 -0700)]
am
6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
* commit '
6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc':
Camera2: Increase mode update timeout.
Eino-Ville Talvala [Tue, 23 Oct 2012 17:31:25 +0000 (10:31 -0700)]
Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
Eino-Ville Talvala [Tue, 23 Oct 2012 16:09:01 +0000 (09:09 -0700)]
Camera2: Increase mode update timeout.
During camera startup, it might take a few hundred milliseconds before
requests start to be dequeued by the HAL. Increase the timeout for
synchronizing mode changes and triggers so that triggers near startup
don't time out.
Bug:
6970465
Change-Id: I9dc35378e8018ec18ae31be874fcb094f8a9a0e9
Eric Laurent [Tue, 23 Oct 2012 15:31:29 +0000 (08:31 -0700)]
am
5f6f5b7d: Merge "stagefright: discard audio at start of capture" into jb-mr1-dev
* commit '
5f6f5b7d6be5d7882102bf0fc3c691ef8fbe03a1':
stagefright: discard audio at start of capture
Eric Laurent [Tue, 23 Oct 2012 15:28:07 +0000 (08:28 -0700)]
Merge "stagefright: discard audio at start of capture" into jb-mr1-dev
Glenn Kasten [Tue, 23 Oct 2012 14:32:37 +0000 (07:32 -0700)]
am
c4640c9e: Increase allowed number of VHQ resamplers to 3
* commit '
c4640c9eef850bb1c754bd6b477f1cc8350c6081':
Increase allowed number of VHQ resamplers to 3
Eric Laurent [Tue, 23 Oct 2012 00:44:24 +0000 (17:44 -0700)]
stagefright: discard audio at start of capture
The new camcorder start sound is longer than previous one and we
must discard more audio when capture starts.
Ideally, camcorder should use synchronous record start.
Bug
7394330.
Change-Id: I219b4e231aba706776dc7ccc4f1c996eaf22f61a
Glenn Kasten [Tue, 23 Oct 2012 00:09:27 +0000 (17:09 -0700)]
Increase allowed number of VHQ resamplers to 3
Bug:
7378660
Change-Id: I69e33ca2eb4bb9bd38e2c63df62cd1130d68baf6
Mathias Agopian [Mon, 22 Oct 2012 18:52:14 +0000 (11:52 -0700)]
am
e384d75b: Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev
* commit '
e384d75b95b9db30d64a18ada93e070cf07de306':
Fix a typo that caused the high quality resampler to produce garbage
Mathias Agopian [Mon, 22 Oct 2012 18:47:39 +0000 (11:47 -0700)]
Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev
Andreas Huber [Mon, 22 Oct 2012 18:06:12 +0000 (11:06 -0700)]
am
0328ec08: WFD use of HDCP is now optional.
* commit '
0328ec08dc1e90caa2a9e0c4e107d8ddaa74af20':
WFD use of HDCP is now optional.
Andreas Huber [Mon, 22 Oct 2012 17:45:08 +0000 (10:45 -0700)]
WFD use of HDCP is now optional.
if the sink supports it we'll use HDCP (and fail if necessary), if it doesn't
we won't. If an HDCP session is established we'll tell our observer that
the connection is secure, otherwise we don't.
Change-Id: I7cbef384f2cf0a6ac65801c581eea227b9ef4c46
related-to-bug:
7368436
Mathias Agopian [Sun, 21 Oct 2012 10:04:05 +0000 (03:04 -0700)]
Fix a typo that caused the high quality resampler to produce garbage
the problem is that if libaudio_resampler is present, it is those
coefficients that will always be selected, but the correct
meta-data.
Bug:
7385994
Change-Id: Ieebeb37b4dfb62a1a051bc29fae2ce056dbc6621
Jean-Michel Trivi [Sat, 20 Oct 2012 00:26:43 +0000 (17:26 -0700)]
am
c3ed4a1c: Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-dev
* commit '
c3ed4a1c3ea71681c71de48c206a899e702864bd':
AAC DRC reference level for mobile is -16dB
Jean-Michel Trivi [Sat, 20 Oct 2012 00:21:55 +0000 (17:21 -0700)]
Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-dev
Eino-Ville Talvala [Sat, 20 Oct 2012 00:19:35 +0000 (17:19 -0700)]
am
9e760d66: Merge "Camera2: Fix potential deadlock" into jb-mr1-dev
* commit '
9e760d66c5dfae4d9688e32d7a02fca09569f7ef':
Camera2: Fix potential deadlock
Eino-Ville Talvala [Fri, 19 Oct 2012 23:47:32 +0000 (16:47 -0700)]
Merge "Camera2: Fix potential deadlock" into jb-mr1-dev
Jean-Michel Trivi [Fri, 19 Oct 2012 21:52:16 +0000 (14:52 -0700)]
AAC DRC reference level for mobile is -16dB
Use -16dB as the default DRC reference level when decoding streams
with DRC metadata.
Bug
7370764
Change-Id: I900cee22f32384a5657fb041b69d42657bcddf09
Marco Nelissen [Fri, 19 Oct 2012 19:41:50 +0000 (12:41 -0700)]
am
3c9e53c6: Merge "Fix valgrind issues" into jb-mr1-dev
* commit '
3c9e53c6ea2b01506addd4fb1164e6a9bbe6e16f':
Fix valgrind issues
Marco Nelissen [Fri, 19 Oct 2012 19:36:47 +0000 (12:36 -0700)]
Merge "Fix valgrind issues" into jb-mr1-dev
Glenn Kasten [Fri, 19 Oct 2012 19:35:14 +0000 (12:35 -0700)]
am
291f824e: Remove active track when thread goes to standby
* commit '
291f824e02ff517a34cfe50220b4e2b402ee998d':
Remove active track when thread goes to standby
Nick Kralevich [Fri, 19 Oct 2012 16:00:32 +0000 (09:00 -0700)]
am
1baa01a5: Merge "hardening: eliminate more .text relocations"
* commit '
1baa01a52f24566c134313fade8b19a582654638':
hardening: eliminate more .text relocations
Nick Kralevich [Fri, 19 Oct 2012 15:40:01 +0000 (08:40 -0700)]
Merge "hardening: eliminate more .text relocations"
Glenn Kasten [Thu, 18 Oct 2012 22:51:31 +0000 (15:51 -0700)]
Remove active track when thread goes to standby
Bug:
7369232
Change-Id: I7ff9f525dad4be0aef562a53015b06ee7d3d50f1
Nick Kralevich [Thu, 18 Oct 2012 23:52:53 +0000 (16:52 -0700)]
hardening: eliminate more .text relocations
In
74bc3e133bd59a65dbed70b5fc89549f04a545e2, a bunch of text relocations
were cleaned up from amrwbenc. Looks like we forgot one. Fixed.
Change-Id: I80d4c68be435c3461731374d2b6d3bdbd61354a5
Eino-Ville Talvala [Wed, 17 Oct 2012 23:32:34 +0000 (16:32 -0700)]
Camera2: Fix potential deadlock
setPreviewWindow was holding a lock during long-lasting HAL calls
which may cause deadlock if the HAL calls back into the service during
the call. Stop holding the lock during these calls, since it's not
essential to do so.
Bug:
7320517
Change-Id: I4a35703d751e22ac32979b5a1288e291610576e7
James Dong [Wed, 17 Oct 2012 23:42:10 +0000 (16:42 -0700)]
am
ccd08439: Added some extra failure logging messages
* commit '
ccd08439c7914d86264c7ad81bfd03cf39aaa9f7':
Added some extra failure logging messages
James Dong [Wed, 17 Oct 2012 21:53:16 +0000 (14:53 -0700)]
Added some extra failure logging messages
o related-to-bug:
7282066
Change-Id: I0896551a45aab61fb571fef19061397ff84321d9
Glenn Kasten [Wed, 17 Oct 2012 22:07:05 +0000 (15:07 -0700)]
am
6a2d62c1: Merge "Manually merge change #111620 from tc3 to mainline, to keep the"
* commit '
6a2d62c1a972da25de53b1718c165f2b7df85a0e':
Manually merge change #111620 from tc3 to mainline, to keep the
Glenn Kasten [Wed, 17 Oct 2012 22:07:04 +0000 (15:07 -0700)]
am
dbe1be24: Merge "Rename "Makefile" to "Android.mk" throughout the tree."
* commit '
dbe1be24c9e6fb92a88a38adbd12a56aa5337f74':
Rename "Makefile" to "Android.mk" throughout the tree.
Glenn Kasten [Wed, 17 Oct 2012 22:07:03 +0000 (15:07 -0700)]
am
4cd2275d: Merge "Rename "TARGET" to "MODULE" in the build system."
* commit '
4cd2275d93a65296e20be27422a00f9e2a78d3a9':
Rename "TARGET" to "MODULE" in the build system.
Glenn Kasten [Wed, 17 Oct 2012 22:07:02 +0000 (15:07 -0700)]
am
108e1961: Merge "Tweak the SINC resampler parameters and double the performance. It\'s using about 10% CPU in the worse case now."
* commit '
108e1961ffb858374dcb39115d1dd831a4a4a75c':
Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now.
Glenn Kasten [Wed, 17 Oct 2012 22:07:00 +0000 (15:07 -0700)]
am
a19c8102: Merge "A sinc resampler for Audioflinger. It\'s not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time."
* commit '
a19c810289392e5733463703e865c7ae407868ad':
A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time.
Glenn Kasten [Wed, 17 Oct 2012 22:06:56 +0000 (15:06 -0700)]
am
5e8e3fc3: Merge "fix a few small typos in the FIR computation"
* commit '
5e8e3fc30111534858fbd1f52a92e5128613af0e':
fix a few small typos in the FIR computation
Glenn Kasten [Wed, 17 Oct 2012 22:06:55 +0000 (15:06 -0700)]
am
d2186701: Merge "This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler."
* commit '
d218670119dc19fbbc5c804ae3ab7c0a5dd985d8':
This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler.
Glenn Kasten [Wed, 17 Oct 2012 21:59:40 +0000 (14:59 -0700)]
Merge "Manually merge change #111620 from tc3 to mainline, to keep the"
Glenn Kasten [Wed, 17 Oct 2012 21:38:05 +0000 (14:38 -0700)]
Merge "Rename "Makefile" to "Android.mk" throughout the tree."
Glenn Kasten [Wed, 17 Oct 2012 21:37:43 +0000 (14:37 -0700)]
Merge "Rename "TARGET" to "MODULE" in the build system."
Glenn Kasten [Wed, 17 Oct 2012 21:37:19 +0000 (14:37 -0700)]
Merge "Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now."
Glenn Kasten [Wed, 17 Oct 2012 21:37:00 +0000 (14:37 -0700)]
Merge "A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time."
Glenn Kasten [Wed, 17 Oct 2012 21:36:35 +0000 (14:36 -0700)]
Merge "fix a few small typos in the FIR computation"
Glenn Kasten [Wed, 17 Oct 2012 21:36:09 +0000 (14:36 -0700)]
Merge "This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler."
Dan Bornstein [Fri, 3 Oct 2008 17:34:57 +0000 (10:34 -0700)]
Manually merge change #111620 from tc3 to mainline, to keep the
automerger from choking on it.
p4 sync
p4 integrate -r -b android_to_tc3 //...@111620,111620
p4 resolve -a
p4 resolve # resolve a couple merge travesties
PRESUBMIT=passed
BUG=
1399648
TBR=edheyl
OCL=111902
Change-Id: I854b01553dd92bbf9c864f5a9bd51a3d665f0ac2
Signed-off-by: Glenn Kasten <gkasten@google.com>
Dave Bort [Fri, 18 Jan 2008 22:51:05 +0000 (14:51 -0800)]
Rename "Makefile" to "Android.mk" throughout the tree.
For <http://b/issue?id=960416>.
I've tested this as much as I can, but 1500 open files =
easy to mess things up. Please let me know if there's
a problem rather than rolling back this change.
PRESUBMIT=passed
BUG=960416
TBR=joeo
OCL=46537
Change-Id: I5a404caf0f398a7afa7ae7abaf2f2a1c6ab490eb
Signed-off-by: Glenn Kasten <gkasten@google.com>
Dave Bort [Tue, 13 Nov 2007 09:30:32 +0000 (01:30 -0800)]
Rename "TARGET" to "MODULE" in the build system.
Part one of the grand renaming.
API_CHANGE: Third parties may need to update their makefiles.
Any variables with "LOCAL" and "TARGET" in their names
should now use "MODULE" instead of "TARGET"; e.g., LOCAL_MODULE,
LOCAL_MODULE_TAGS.
PRESUBMIT=passed
OCL=39840
Change-Id: Ica9a7937d3d9552ab84db46ac6eea8a290e404fe
Signed-off-by: Glenn Kasten <gkasten@google.com>
Mathias Agopian [Tue, 30 Oct 2007 06:44:25 +0000 (23:44 -0700)]
Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now.
Change-Id: I50ac7e6c6702a427fa36ab6d976c507155057507
Signed-off-by: Glenn Kasten <gkasten@google.com>
Mathias Agopian [Mon, 29 Oct 2007 11:34:36 +0000 (04:34 -0700)]
A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time.
Change-Id: I80eb5185e13ebdb907e0b85c49ba1272c23d60ec
Signed-off-by: Glenn Kasten <gkasten@google.com>
Mathias Agopian [Fri, 24 Aug 2007 04:01:28 +0000 (21:01 -0700)]
fix a few small typos in the FIR computation
Change-Id: I6e56b514fe520f30f7487f85c64ea5d2a7c19b40
Signed-off-by: Glenn Kasten <gkasten@google.com>
Mathias Agopian [Thu, 23 Aug 2007 10:16:02 +0000 (03:16 -0700)]
This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler.
Change-Id: I99be2505139b8e0e7647200e1647509d4f7e6067
Signed-off-by: Glenn Kasten <gkasten@google.com>
Marco Nelissen [Wed, 17 Oct 2012 17:57:02 +0000 (10:57 -0700)]
Fix valgrind issues
We were reading some uninitialized memory when creating bass boost and EQ
effects, and using memcpy() with identical source and destination.
Change-Id: I15ea1b2c52ae05cbf54aef04351e89805e0ebf8e
Eino-Ville Talvala [Wed, 17 Oct 2012 00:01:52 +0000 (17:01 -0700)]
am
ecfbc952: Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev
* commit '
ecfbc952d51c71832f739b7483dcc8cb5fe68038':
Camera2: Improve quirks focusing behavior.
Eino-Ville Talvala [Tue, 16 Oct 2012 23:57:05 +0000 (16:57 -0700)]
Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev
Eino-Ville Talvala [Tue, 16 Oct 2012 19:58:21 +0000 (12:58 -0700)]
Camera2: Improve quirks focusing behavior.
- When scene mode is set and the AF quirk is in use, don't change AF
mode and then cancel when AF cancel is received. Just change mode
since that also implies a cancel.
- Only trigger quirks switch when a focusing area is set.
Bug:
7318812
Change-Id: I28d8755553bd78052e774701210cb94d84ee2046
Jean-Michel Trivi [Tue, 16 Oct 2012 18:31:54 +0000 (11:31 -0700)]
am
bbe11e46: Merge "Fix track estimation for presentation complete" into jb-mr1-dev
* commit '
bbe11e46faf8f9e3296431993c36d3efc61337b5':
Fix track estimation for presentation complete
Jean-Michel Trivi [Tue, 16 Oct 2012 18:27:24 +0000 (11:27 -0700)]
Merge "Fix track estimation for presentation complete" into jb-mr1-dev
Eino-Ville Talvala [Tue, 16 Oct 2012 18:14:28 +0000 (11:14 -0700)]
am
54717320: Camera2: Don\'t touch frame counter on output frames.
* commit '
547173205b3fd909dd72b597f6372840c38460e4':
Camera2: Don't touch frame counter on output frames.
Eino-Ville Talvala [Tue, 16 Oct 2012 18:06:11 +0000 (11:06 -0700)]
am
d6cc4a62: Camera2: When focus is already locked in CAF mode, do not trigger HAL.
* commit '
d6cc4a62f3d94cad4dd36bd0a844ba8764177d26':
Camera2: When focus is already locked in CAF mode, do not trigger HAL.
Jean-Michel Trivi [Tue, 16 Oct 2012 17:29:01 +0000 (10:29 -0700)]
Fix track estimation for presentation complete
Audio tracks were not using the right latency estimation for
signalling the completion of their presetation. This caused
the synchronization mechanism between playback and record to be
off, and a synchronized recording would contain some of the audio
that was meant to be over once recording would start.
Use the playback thread's latency reporting which takes the audio
pipe into account.
Bug
7237669
Change-Id: I23a907a53ad0b0d68d246789ec595a77a79fced5
Eino-Ville Talvala [Tue, 16 Oct 2012 17:28:07 +0000 (10:28 -0700)]
Camera2: Don't touch frame counter on output frames.
Bug:
7357069
Change-Id: I9cd0cdcc23959bfecced5f47bb9e8c59c997dade
Eino-Ville Talvala [Tue, 16 Oct 2012 17:17:30 +0000 (10:17 -0700)]
Camera2: When focus is already locked in CAF mode, do not trigger HAL.
In HAL2 CAF modes, once focus is locked by an AF trigger, additional
triggers will not cause AF notifications, since the state will not
change again until a cancelAutofocus call.
Since the old API still expects to see a notification, short-circuit
this at the service and send an immediate success notification.
Bug:
7318298
Change-Id: Ib209a24eaf2a35a247d06aea671efe80a33d751e
Glenn Kasten [Mon, 15 Oct 2012 21:54:31 +0000 (14:54 -0700)]
Merge "Fix log spam: Failed to open libwvm.so" into jb-mr1-dev-plus-aosp
The Android Open Source Project [Mon, 15 Oct 2012 14:38:34 +0000 (07:38 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I427041221d8f8f3237c806f3d8a3f67c0b3a4242
Glenn Kasten [Fri, 12 Oct 2012 22:59:28 +0000 (15:59 -0700)]
Fix log spam: Failed to open libwvm.so
Bug:
7342813
Change-Id: I98852f036e4679a653723fc2bf1435d6e9d7d34c
James Dong [Fri, 12 Oct 2012 18:03:43 +0000 (11:03 -0700)]
am
b4a55269: Fix some missing checks against missing codecs
* commit '
b4a55269a5b39c73de2cc1d4013d0631ef18c77d':
Fix some missing checks against missing codecs
The Android Automerger [Fri, 12 Oct 2012 17:26:32 +0000 (10:26 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 13:59:17 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
James Dong [Fri, 12 Oct 2012 03:28:50 +0000 (20:28 -0700)]
Fix some missing checks against missing codecs
o related-to-bug:
6971073
Change-Id: Ia6d926663231f9a9ef31c82c85c70595c4a30ebe
The Android Automerger [Thu, 11 Oct 2012 15:19:01 +0000 (08:19 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Thu, 11 Oct 2012 15:04:39 +0000 (08:04 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I81df464c8faae1c41e8e1b8f0da8337e64c3fd09
The Android Automerger [Thu, 11 Oct 2012 14:03:39 +0000 (07:03 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Thu, 11 Oct 2012 12:57:06 +0000 (05:57 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie5b35b4154bf8cc096620a99382b5137ebb5ca81
Eino-Ville Talvala [Thu, 11 Oct 2012 00:51:31 +0000 (17:51 -0700)]
am
a14be593: Camera2: Don\'t error out of startPreview when already recording.
* commit '
a14be59340219c47639ec77a352d2af362551a6f':
Camera2: Don't error out of startPreview when already recording.
Eino-Ville Talvala [Thu, 11 Oct 2012 00:17:01 +0000 (17:17 -0700)]
Camera2: Don't error out of startPreview when already recording.
Bug:
7327474
Change-Id: I603da5b8bd58e5a700d7ae0b3d34bd89bbcb1d53
Jean-Michel Trivi [Wed, 10 Oct 2012 23:36:04 +0000 (16:36 -0700)]
am
7e2c0a15: Merge "Support querying active record sources" into jb-mr1-dev
* commit '
7e2c0a15bb8086460070811a152029726479a297':
Support querying active record sources
Jean-Michel Trivi [Wed, 10 Oct 2012 23:30:19 +0000 (16:30 -0700)]
Merge "Support querying active record sources" into jb-mr1-dev
Eino-Ville Talvala [Wed, 10 Oct 2012 23:17:11 +0000 (16:17 -0700)]
am
907e5651: Camera2: Don\'t let unlocks happen during recording.
* commit '
907e5651c18d0e25073743a49a685fe1a385939a':
Camera2: Don't let unlocks happen during recording.
Eino-Ville Talvala [Wed, 10 Oct 2012 22:28:53 +0000 (15:28 -0700)]
Camera2: Don't let unlocks happen during recording.
Bug:
7309020
Change-Id: I6e66809b868d2e8f47f71e6f8752b44ec06dfb17
The Android Automerger [Wed, 10 Oct 2012 21:06:30 +0000 (14:06 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Wed, 10 Oct 2012 20:17:01 +0000 (13:17 -0700)]
am
55f6c9df: Camera2: Do not set auto-white-balance regions from metering regions.
* commit '
55f6c9dfd713776e251655b3ddd496b17df0926e':
Camera2: Do not set auto-white-balance regions from metering regions.
Eino-Ville Talvala [Wed, 10 Oct 2012 20:05:48 +0000 (13:05 -0700)]
am
c0379204: Camera: Limit valid caller PIDs for camera clients.
* commit '
c03792041b9dd6f7f54abd6c82bd6c755a336cd8':
Camera: Limit valid caller PIDs for camera clients.
Eino-Ville Talvala [Tue, 9 Oct 2012 06:58:02 +0000 (23:58 -0700)]
Camera2: Do not set auto-white-balance regions from metering regions.
Per API documentation, metering regions are only for AE, not also for AWB.
Bug:
7312720
Change-Id: I39bcf33e4c81e80022f45e8fca77ea6cf9ba115e
Jean-Michel Trivi [Wed, 10 Oct 2012 19:11:16 +0000 (12:11 -0700)]
Support querying active record sources
Add support for querying whether there is currently a recording
underway from the specified audio source.
Bug
7314859
Change-Id: I986b231a10ffd368b08ec2f9c7f348d28eaeb892
The Android Open Source Project [Wed, 10 Oct 2012 16:44:29 +0000 (09:44 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I0a56a7cd77b8d52e699455b6bd01b884bcc32bc4
Eino-Ville Talvala [Wed, 10 Oct 2012 05:16:58 +0000 (22:16 -0700)]
Camera: Limit valid caller PIDs for camera clients.
Narrow down on PID checks to avoid cases where service can access the
camera even though it shouldn't be able to, per API semantics.
Bug:
6970469
Change-Id: Ic468a31949c28ef978b6ed48a70e4601c7ced684
The Android Automerger [Wed, 10 Oct 2012 15:50:21 +0000 (08:50 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Wed, 10 Oct 2012 15:37:33 +0000 (08:37 -0700)]
am
2b0db6ae: Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev
* commit '
2b0db6aea3be519334f340ca97581db902196690':
Camera: Clear Hardware device pointer when initialization fails
The Android Automerger [Wed, 10 Oct 2012 13:59:19 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Wed, 10 Oct 2012 04:57:37 +0000 (21:57 -0700)]
Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev
Andreas Huber [Tue, 9 Oct 2012 23:16:15 +0000 (16:16 -0700)]
am
73125afc: Merge "Switch audio mode based on dongle\'s capabilities" into jb-mr1-dev
* commit '
73125afc0333c9aba37749e605537342caca11cd':
Switch audio mode based on dongle's capabilities
Andreas Huber [Tue, 9 Oct 2012 23:11:27 +0000 (16:11 -0700)]
Merge "Switch audio mode based on dongle's capabilities" into jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 23:07:19 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Tue, 9 Oct 2012 22:53:34 +0000 (15:53 -0700)]
Switch audio mode based on dongle's capabilities
properly parse rtp port and use it to setup session.
Change-Id: Ic7521cb867143278196c3ce4b19a74ecc2703d8e
related-to-bug:
7318719
The Android Automerger [Tue, 9 Oct 2012 22:38:51 +0000 (15:38 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 22:28:00 +0000 (15:28 -0700)]
am
dca0ac21: Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev
* commit '
dca0ac2193e87c57d871dd208073107408c13c0a':
Camera2: Fix uninitialized parameters.
Eino-Ville Talvala [Tue, 9 Oct 2012 22:22:46 +0000 (15:22 -0700)]
Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev
Igor Murashkin [Tue, 9 Oct 2012 21:45:37 +0000 (14:45 -0700)]
Camera: Clear Hardware device pointer when initialization fails
When disconnecting, don't try to call device functions if the initialization
fails since this can lead to internal HAL segfaults.
Bug:
7317107
Change-Id: Ib65db7eb6556ee10d844959934b1bfd7bb08d0ff
Igor Murashkin [Tue, 9 Oct 2012 20:53:17 +0000 (13:53 -0700)]
am
3d84d38e: Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev
* commit '
3d84d38e7ac02b47d17f4bb272f18f8b0e873104':
Camera2: Call onAutoFocus immediately for fixed-focus cameras
Igor Murashkin [Tue, 9 Oct 2012 20:49:28 +0000 (13:49 -0700)]
Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 19:52:16 +0000 (12:52 -0700)]
Camera2: Fix uninitialized parameters.
Some parameters were not being set to default values, causing strange
flakiness in any app that wasn't calling setParameters. This includes
many CTS tests.
Bug:
6970468
Change-Id: If91635afc000e23862e7b039292a55349274c5ee
Eino-Ville Talvala [Tue, 9 Oct 2012 19:15:58 +0000 (12:15 -0700)]
am
d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev
* commit '
d016cf5b12cb73bd49bcecb0d5a4958df23620c3':
Camera2: Move non-ZSL shutter sound firing to be later.