OSDN Git Service

android-x86/frameworks-av.git
11 years agoam ed653a35: am ecfbc952: Merge "Camera2: Improve quirks focusing behavior." into...
Eino-Ville Talvala [Wed, 17 Oct 2012 00:03:53 +0000 (17:03 -0700)]
am ed653a35: am ecfbc952: Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev

* commit 'ed653a35784969b7d36e8b36bd421e2a54def0de':
  Camera2: Improve quirks focusing behavior.

11 years agoam ecfbc952: Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev
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.

11 years agoMerge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev
Eino-Ville Talvala [Tue, 16 Oct 2012 23:57:05 +0000 (16:57 -0700)]
Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev

11 years agoCamera2: Improve quirks focusing behavior.
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

11 years agoam aa00830e: am bbe11e46: Merge "Fix track estimation for presentation complete"...
Jean-Michel Trivi [Tue, 16 Oct 2012 18:34:52 +0000 (11:34 -0700)]
am aa00830e: am bbe11e46: Merge "Fix track estimation for presentation complete" into jb-mr1-dev

* commit 'aa00830e46cb7494af7217246788c1bca83b1d04':
  Fix track estimation for presentation complete

11 years agoam bbe11e46: Merge "Fix track estimation for presentation complete" into jb-mr1-dev
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

11 years agoMerge "Fix track estimation for presentation complete" into jb-mr1-dev
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

11 years agoam 74a7bcc0: am 54717320: Camera2: Don\'t touch frame counter on output frames.
Eino-Ville Talvala [Tue, 16 Oct 2012 18:17:16 +0000 (11:17 -0700)]
am 74a7bcc0: am 54717320: Camera2: Don\'t touch frame counter on output frames.

* commit '74a7bcc052d9bdd0f555e9be6f5ecaf92c6b22d8':
  Camera2: Don't touch frame counter on output frames.

11 years agoam 54717320: Camera2: Don\'t touch frame counter on output frames.
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.

11 years agoam 522fa119: am d6cc4a62: Camera2: When focus is already locked in CAF mode, do not...
Eino-Ville Talvala [Tue, 16 Oct 2012 18:07:54 +0000 (11:07 -0700)]
am 522fa119: am d6cc4a62: Camera2: When focus is already locked in CAF mode, do not trigger HAL.

* commit '522fa119fe2745cd950b6216ad6b49587372b7b3':
  Camera2: When focus is already locked in CAF mode, do not trigger HAL.

11 years agoam d6cc4a62: Camera2: When focus is already locked in CAF mode, do not trigger HAL.
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.

11 years agoFix track estimation for presentation complete
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

11 years agoCamera2: Don't touch frame counter on output frames.
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

11 years agoCamera2: When focus is already locked in CAF mode, do not trigger HAL.
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

11 years agoam 2e5aa980: Merge "Fix log spam: Failed to open libwvm.so" into jb-mr1-dev-plus...
Glenn Kasten [Mon, 15 Oct 2012 21:58:39 +0000 (14:58 -0700)]
am 2e5aa980: Merge "Fix log spam: Failed to open libwvm.so" into jb-mr1-dev-plus-aosp

* commit '2e5aa980c9eba995d99aa13e6b5fa2714dc9f61e':
  Fix log spam: Failed to open libwvm.so

11 years agoMerge "Fix log spam: Failed to open libwvm.so" into jb-mr1-dev-plus-aosp
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

11 years agoam f93f5bf4: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
The Android Open Source Project [Mon, 15 Oct 2012 14:42:48 +0000 (07:42 -0700)]
am f93f5bf4: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'f93f5bf4a48df3b1557734a1e945b9556ce16f92':

11 years agoReconcile with jb-mr1-factory-release jb-mr1-release - do not merge
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

11 years agoFix log spam: Failed to open libwvm.so
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

11 years agoam 954f6afe: am b4a55269: Fix some missing checks against missing codecs
James Dong [Fri, 12 Oct 2012 18:10:36 +0000 (11:10 -0700)]
am 954f6afe: am b4a55269: Fix some missing checks against missing codecs

* commit '954f6afed22e8a723ddb9a6448c14bce4e008a9c':
  Fix some missing checks against missing codecs

11 years agoam b4a55269: Fix some missing checks against missing codecs
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

11 years agomerge in jb-mr1-factory-release history after reset to jb-mr1-dev
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

11 years agomerge in jb-mr1-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

11 years agoFix some missing checks against missing codecs
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

11 years agomerge in jb-mr1-factory-release history after reset to jb-mr1-dev
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

11 years agoam 8616d32f: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 11 Oct 2012 15:08:21 +0000 (08:08 -0700)]
am 8616d32f: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8616d32f7382563a1aea192e835b2cbbefd9f481':

11 years agoReconcile with jb-mr1-release - do not merge
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

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

11 years agoam 2ad5a49a: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Thu, 11 Oct 2012 12:59:17 +0000 (05:59 -0700)]
am 2ad5a49a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2ad5a49adfefa0d9c34ec9ea387fc7a30f1e7be6':

11 years agoReconcile with jb-mr1-release - do not merge
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

11 years agoam cb3911d3: am a14be593: Camera2: Don\'t error out of startPreview when already...
Eino-Ville Talvala [Thu, 11 Oct 2012 00:52:31 +0000 (17:52 -0700)]
am cb3911d3: am a14be593: Camera2: Don\'t error out of startPreview when already recording.

* commit 'cb3911d30c515e06fbea0000af02fa3d09688943':
  Camera2: Don't error out of startPreview when already recording.

11 years agoam a14be593: Camera2: Don\'t error out of startPreview when already recording.
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.

11 years agoam 0f95fadb: am 7e2c0a15: Merge "Support querying active record sources" into jb...
Jean-Michel Trivi [Thu, 11 Oct 2012 00:23:19 +0000 (17:23 -0700)]
am 0f95fadb: am 7e2c0a15: Merge "Support querying active record sources" into jb-mr1-dev

* commit '0f95fadb8a3ee402f2c51a932a06f1f685ab2d35':
  Support querying active record sources

11 years agoam f5230955: am 907e5651: Camera2: Don\'t let unlocks happen during recording.
Eino-Ville Talvala [Thu, 11 Oct 2012 00:22:53 +0000 (17:22 -0700)]
am f5230955: am 907e5651: Camera2: Don\'t let unlocks happen during recording.

* commit 'f52309555013e9909b248374f96d22dae29f6454':
  Camera2: Don't let unlocks happen during recording.

11 years agoCamera2: 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

11 years agoam 7e2c0a15: Merge "Support querying active record sources" into jb-mr1-dev
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

11 years agoMerge "Support querying active record sources" into jb-mr1-dev
Jean-Michel Trivi [Wed, 10 Oct 2012 23:30:19 +0000 (16:30 -0700)]
Merge "Support querying active record sources" into jb-mr1-dev

11 years agoam 907e5651: Camera2: Don\'t let unlocks happen during recording.
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.

11 years agoCamera2: 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

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

11 years agoam 6f846139: am 55f6c9df: Camera2: Do not set auto-white-balance regions from meterin...
Eino-Ville Talvala [Wed, 10 Oct 2012 20:19:18 +0000 (13:19 -0700)]
am 6f846139: am 55f6c9df: Camera2: Do not set auto-white-balance regions from metering regions.

* commit '6f846139d97ad6cccdd2f243ccf3a19036ad12c7':
  Camera2: Do not set auto-white-balance regions from metering regions.

11 years agoam 55f6c9df: Camera2: Do not set auto-white-balance regions from metering regions.
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.

11 years agoam e44d7f83: am c0379204: Camera: Limit valid caller PIDs for camera clients.
Eino-Ville Talvala [Wed, 10 Oct 2012 20:07:01 +0000 (13:07 -0700)]
am e44d7f83: am c0379204: Camera: Limit valid caller PIDs for camera clients.

* commit 'e44d7f83a4d04b90417684d74f18ad8c703b981a':
  Camera: Limit valid caller PIDs for camera clients.

11 years agoam c0379204: Camera: Limit valid caller PIDs for camera clients.
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.

11 years agoCamera2: Do not set auto-white-balance regions from metering regions.
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

11 years agoSupport querying active record sources
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

11 years agoam 6c839563: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
The Android Open Source Project [Wed, 10 Oct 2012 16:47:53 +0000 (09:47 -0700)]
am 6c839563: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '6c8395633d4ed9f88888e6df0ae2f33fd8401fd0':

11 years agoReconcile with jb-mr1-factory-release jb-mr1-release - do not merge
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

11 years agoCamera: Limit valid caller PIDs for camera clients.
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

11 years agomerge in jb-mr1-factory-release history after reset to jb-mr1-dev
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

11 years agoam 4c7b3129: am 2b0db6ae: Merge "Camera: Clear Hardware device pointer when initializ...
Eino-Ville Talvala [Wed, 10 Oct 2012 15:39:58 +0000 (08:39 -0700)]
am 4c7b3129: am 2b0db6ae: Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev

* commit '4c7b312964b2430ccc1f99e99092cc870be2a293':
  Camera: Clear Hardware device pointer when initialization fails

11 years agoam 2b0db6ae: Merge "Camera: Clear Hardware device pointer when initialization fails...
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

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

11 years agoMerge "Camera: Clear Hardware device pointer when initialization fails" into 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

11 years agoam 1f9300d9: am 73125afc: Merge "Switch audio mode based on dongle\'s capabilities...
Andreas Huber [Tue, 9 Oct 2012 23:18:17 +0000 (16:18 -0700)]
am 1f9300d9: am 73125afc: Merge "Switch audio mode based on dongle\'s capabilities" into jb-mr1-dev

* commit '1f9300d9f0050b972ee6dd6c39b362baf8528a38':
  Switch audio mode based on dongle's capabilities

11 years agoam 73125afc: Merge "Switch audio mode based on dongle\'s capabilities" 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

11 years agoMerge "Switch audio mode based on dongle's capabilities" into jb-mr1-dev
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

11 years agomerge in jb-mr1-release history after reset to 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

11 years agoSwitch audio mode based on dongle's capabilities
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

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
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

11 years agoam 754cbdd2: am dca0ac21: Merge "Camera2: Fix uninitialized parameters." into jb...
Eino-Ville Talvala [Tue, 9 Oct 2012 22:30:44 +0000 (15:30 -0700)]
am 754cbdd2: am dca0ac21: Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev

* commit '754cbdd2dd3376bb2b55d762c2909f816bd768cc':
  Camera2: Fix uninitialized parameters.

11 years agoam dca0ac21: Merge "Camera2: Fix uninitialized parameters." into 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.

11 years agoMerge "Camera2: Fix uninitialized parameters." into jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 22:22:46 +0000 (15:22 -0700)]
Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev

11 years agoCamera: Clear Hardware device pointer when initialization fails
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

11 years agoam e4664bb0: am 3d84d38e: Merge "Camera2: Call onAutoFocus immediately for fixed...
Igor Murashkin [Tue, 9 Oct 2012 20:54:40 +0000 (13:54 -0700)]
am e4664bb0: am 3d84d38e: Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev

* commit 'e4664bb098a9b7d6ae1a93486456eff71eaae1bf':
  Camera2: Call onAutoFocus immediately for fixed-focus cameras

11 years agoam 3d84d38e: Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras...
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

11 years agoMerge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev
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

11 years agoCamera2: Fix uninitialized parameters.
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

11 years agoam 240a538b: am d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing to be...
Eino-Ville Talvala [Tue, 9 Oct 2012 19:17:38 +0000 (12:17 -0700)]
am 240a538b: am d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev

* commit '240a538b59b905b68d46e39d79c8d48d1662161c':
  Camera2: Move non-ZSL shutter sound firing to be later.

11 years agoam d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing to be later." into...
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.

11 years agoMerge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 19:12:07 +0000 (12:12 -0700)]
Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev

11 years agoam 80dfc5dc: am 350d3b68: Merge "audio policy: deprecate ro.camera.sound.forced"...
Eric Laurent [Tue, 9 Oct 2012 18:34:32 +0000 (11:34 -0700)]
am 80dfc5dc: am 350d3b68: Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev

* commit '80dfc5dc7ec6d20beb0360e8efcc5331f4d25d06':
  audio policy: deprecate ro.camera.sound.forced

11 years agoam 350d3b68: Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev
Eric Laurent [Tue, 9 Oct 2012 18:32:31 +0000 (11:32 -0700)]
am 350d3b68: Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev

* commit '350d3b686357a159fb1a962bbd41e01924d27cad':
  audio policy: deprecate ro.camera.sound.forced

11 years agoMerge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev
Eric Laurent [Tue, 9 Oct 2012 18:28:53 +0000 (11:28 -0700)]
Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev

11 years agoCamera2: Call onAutoFocus immediately for fixed-focus cameras
Igor Murashkin [Tue, 9 Oct 2012 01:05:12 +0000 (18:05 -0700)]
Camera2: Call onAutoFocus immediately for fixed-focus cameras

Bug: 7311578
Change-Id: Ib8a8ea1f5fc269abdd24ed1e0370dc9b87b284ee

11 years agoam df81a1aa: (-s ours) Reconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 9 Oct 2012 14:31:59 +0000 (07:31 -0700)]
am df81a1aa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'df81a1aa1e89da71f02307f7eddb3d1ca5ee4a55':
  Camera2: Don't promote weak IBinder ptrs to strong ones

11 years agoReconcile with jb-mr1-release - do not merge
The Android Open Source Project [Tue, 9 Oct 2012 14:29:10 +0000 (07:29 -0700)]
Reconcile with jb-mr1-release - do not merge

Change-Id: I2d81c143dd737e9faf93df9a104d79f7f36fd429

11 years agomerge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 13:59:19 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev

11 years agoam 843aba43: am 2458d482: Merge "Camera2: Always disconnect in the client destructor...
Eino-Ville Talvala [Tue, 9 Oct 2012 05:25:29 +0000 (22:25 -0700)]
am 843aba43: am 2458d482: Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev

* commit '843aba43ef85f5a40db03e0f384ed096b03592d0':
  Camera2: Always disconnect in the client destructor

11 years agoam 2458d482: Merge "Camera2: Always disconnect in the client destructor" into jb...
Eino-Ville Talvala [Tue, 9 Oct 2012 05:23:37 +0000 (22:23 -0700)]
am 2458d482: Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev

* commit '2458d482c4822c6f9e6274f5bd12b6aea095a9cd':
  Camera2: Always disconnect in the client destructor

11 years agoMerge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 05:20:47 +0000 (22:20 -0700)]
Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev

11 years agoCamera2: Move non-ZSL shutter sound firing to be later.
Eino-Ville Talvala [Mon, 8 Oct 2012 05:43:48 +0000 (22:43 -0700)]
Camera2: Move non-ZSL shutter sound firing to be later.

Instead of firing shutter sound when capture request is submitted for
non-ZSL captures, fire it when the metadata frame is received. This
guarantees that the shutter sound fires after picture capture is
completed by the sensor.

Bug: 7259900
Change-Id: I4a1eeed89ed0400bf80b0f0cc2d5799c3d9bb9e3

11 years agoam 4a4253b9: am 82edd543: Camera2: isSmoothZoomSupported should return FALSE
Igor Murashkin [Mon, 8 Oct 2012 23:22:39 +0000 (16:22 -0700)]
am 4a4253b9: am 82edd543: Camera2: isSmoothZoomSupported should return FALSE

* commit '4a4253b979586c9de21425f5e3cb34da9f1e57de':
  Camera2: isSmoothZoomSupported should return FALSE

11 years agoam 9ea63b3b: am 6f854608: Camera2: Set default flash mode to FLASH_OFF
Alex Ray [Mon, 8 Oct 2012 23:21:43 +0000 (16:21 -0700)]
am 9ea63b3b: am 6f854608: Camera2: Set default flash mode to FLASH_OFF

* commit '9ea63b3bfd696bcce9cb28e86218a3449dd699d8':
  Camera2: Set default flash mode to FLASH_OFF

11 years agoaudio policy: deprecate ro.camera.sound.forced
Eric Laurent [Mon, 8 Oct 2012 23:00:36 +0000 (16:00 -0700)]
audio policy: deprecate ro.camera.sound.forced

The volume and routing policy of AUDIO_STREAM_ENFORCED_AUDIBLE is
now controlled by AudioService.

Do not read ro.camera.sound.forced is not needed anymore.

Bug 7032634.

Change-Id: Ic0a6396fc4b6efb91cdb4dffe0c8eb035d0440bd

11 years agoam 82edd543: Camera2: isSmoothZoomSupported should return FALSE
Igor Murashkin [Mon, 8 Oct 2012 22:32:09 +0000 (15:32 -0700)]
am 82edd543: Camera2: isSmoothZoomSupported should return FALSE

* commit '82edd5431951f461058c07b73c0dbc093aa45c99':
  Camera2: isSmoothZoomSupported should return FALSE

11 years agoCamera2: Always disconnect in the client destructor
Igor Murashkin [Mon, 8 Oct 2012 22:09:46 +0000 (15:09 -0700)]
Camera2: Always disconnect in the client destructor

If Camera2Client failed to initialize, it would skip disconnect step,
and thus the camera would be forever marked as busy. By always calling
disconnect it will always call free.

It also adds a new guarantee that Client::disconnect is idempotent

Bug: 7298182
Change-Id: Ic9876f1665b7d9b3c0da692880f63f165e3f4fa5

11 years agoCamera2: isSmoothZoomSupported should return FALSE
Igor Murashkin [Mon, 8 Oct 2012 21:08:32 +0000 (14:08 -0700)]
Camera2: isSmoothZoomSupported should return FALSE

Bug: 7308024
Change-Id: Ib757bef8f6dc203f8dfa6ea6d11191e3c7cfcc6d

11 years agoam 6f854608: Camera2: Set default flash mode to FLASH_OFF
Alex Ray [Mon, 8 Oct 2012 21:13:04 +0000 (14:13 -0700)]
am 6f854608: Camera2: Set default flash mode to FLASH_OFF

* commit '6f854608d26d7abcce5e46396c7260ed7b250653':
  Camera2: Set default flash mode to FLASH_OFF

11 years agoCamera2: Set default flash mode to FLASH_OFF
Alex Ray [Mon, 8 Oct 2012 19:04:15 +0000 (12:04 -0700)]
Camera2: Set default flash mode to FLASH_OFF

Bug: 6970090
Change-Id: I904b1be2ee0710e82e8e647753a705184c10b46c

11 years agoam a761686d: am 4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 validation...
Igor Murashkin [Mon, 8 Oct 2012 20:15:44 +0000 (13:15 -0700)]
am a761686d: am 4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev

* commit 'a761686d14ff8abd704a4802ca6ea0b801a9a32d':
  Camera2: Fix Parameters#setZoom off by 1 validation error

11 years agoam 4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into...
Igor Murashkin [Mon, 8 Oct 2012 20:14:25 +0000 (13:14 -0700)]
am 4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev

* commit '4c9aeb21051e908b0a0a0864a04a96a4109717a1':
  Camera2: Fix Parameters#setZoom off by 1 validation error

11 years agoMerge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev
Igor Murashkin [Mon, 8 Oct 2012 20:10:48 +0000 (13:10 -0700)]
Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev

11 years agoam c7ee4fda: am b8f0090a: Merge "Camera2: On stopping preview, wait until captures...
Eino-Ville Talvala [Mon, 8 Oct 2012 19:23:34 +0000 (12:23 -0700)]
am c7ee4fda: am b8f0090a: Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev

* commit 'c7ee4fda96539815e877cf035c9984f6009c4875':
  Camera2: On stopping preview, wait until captures are completed.

11 years agoam b8f0090a: Merge "Camera2: On stopping preview, wait until captures are completed...
Eino-Ville Talvala [Mon, 8 Oct 2012 19:22:05 +0000 (12:22 -0700)]
am b8f0090a: Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev

* commit 'b8f0090af19b95027d2e08667c662d058832f94b':
  Camera2: On stopping preview, wait until captures are completed.

11 years agoMerge "Camera2: On stopping preview, wait until captures are completed." into jb...
Eino-Ville Talvala [Mon, 8 Oct 2012 19:17:36 +0000 (12:17 -0700)]
Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev

11 years agoCamera2: Fix Parameters#setZoom off by 1 validation error
Igor Murashkin [Mon, 8 Oct 2012 18:16:03 +0000 (11:16 -0700)]
Camera2: Fix Parameters#setZoom off by 1 validation error

Bug: 7298683
Change-Id: If79ac6396379593eb852f041ca7d5a20ad2f9e6d

11 years agoam 97f00a6b: am e18c1cce: Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed...
Igor Murashkin [Mon, 8 Oct 2012 17:57:20 +0000 (10:57 -0700)]
am 97f00a6b: am e18c1cce: Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev

* commit '97f00a6b6cde4837e0ab3751d7cfd2921c11f9b4':
  Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras

11 years agoam e18c1cce: Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras...
Igor Murashkin [Mon, 8 Oct 2012 17:26:36 +0000 (10:26 -0700)]
am e18c1cce: Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev

* commit 'e18c1cce29dde2054ce52b9135b152901883ca91':
  Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras

11 years agoMerge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev
Igor Murashkin [Mon, 8 Oct 2012 17:23:06 +0000 (10:23 -0700)]
Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev