Commit Graph

1686 Commits

Author SHA1 Message Date
Daniel Estrada Alva
aa8060df8c am 08c04874: am f3349406: am 243095c9: am 47ee2ecf: Merge "Disable AR HW when client binder dies." into mnc-dr-dev
* commit '08c0487487ed77d25f2b0593cb3aba31b2b3fe57':
  Disable AR HW when client binder dies.
2015-08-27 05:11:58 +00:00
Chien-Yu Chen
8af9d7687d am fcfa1d57: am 2aa23ac6: am aebc3cce: am fd059b34: am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
* commit 'fcfa1d57ea6ab245095d3ab1fcef103fa0abcd83':
  Camera: Update for reprocess session
2015-08-26 21:12:03 +00:00
Daniel Estrada Alva
47ee2ecf82 Merge "Disable AR HW when client binder dies." into mnc-dr-dev 2015-08-26 21:09:50 +00:00
Chien-Yu Chen
fd059b34fa am e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
* commit 'e4c3ff2f50dd8126bee379dd3b078ecf36d6a294':
  Camera: Update for reprocess session
2015-08-26 19:07:52 +00:00
Chien-Yu Chen
e4c3ff2f50 Merge "Camera: Update for reprocess session" into mnc-dev 2015-08-26 18:56:15 +00:00
Daniel Estrada Alva
8ff73b596e Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev 2015-08-26 17:30:09 +00:00
Yasuhiro Matsuda
92386c42a8 Merge "Broadcast ACTION_USB_STATE only if necessary." 2015-08-26 09:36:40 +00:00
Chien-Yu Chen
e90c6d0ad2 Camera: Update for reprocess session
Document that some devices may not support submitting multiple
outputs in a single reprocess capture requests. Remove the
guaranteed reprocess session configurations that are less common
and may not be supported by all devices.

Bug: 23422291
Change-Id: I1c869612e9a83ef480113ca2628f68511a150b64
2015-08-25 11:58:21 -07:00
Eino-Ville Talvala
170e089551 am d9a24b1b: am d7f3dfb7: am cd05509a: am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
* commit 'd9a24b1b907fabc76a9c4bdc07ac26b6959db811':
  Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-25 00:46:50 +00:00
Eino-Ville Talvala
b8079c5c49 am f76d558b: am 93826c7e: am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
* commit 'f76d558bb0ea3bbac422a90febfdb0417b5397d6':
  Camera: Add support for notifying NFC stack when camera is active
2015-08-24 23:39:22 +00:00
Eino-Ville Talvala
6393275f5f am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
* commit '2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd':
  Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:12:16 +00:00
Eino-Ville Talvala
2bf7b98a2a Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev 2015-08-24 23:08:00 +00:00
Eino-Ville Talvala
e3f5483977 Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
Devices that do not support the BURST_CAPTURE capability do not
get the split resolution lists. However, one spot in the stream
configuration map enumeration did not guard against this properly.

As a result, the category of devices that are not-BURST-CAPABLE and
do list resolutions that operate at a 'slow' (<= 20fps) rates cause
an assert to fire from an apparently-inconsistent size list.

Guard the filtering correctly, to correctly support such
devices.

Bug: 23489536
Change-Id: Ib026f6555c69b7fac0cd1ea5027d598644cd8701
2015-08-24 14:08:58 -07:00
Eino-Ville Talvala
a42cf680a5 Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev 2015-08-24 19:22:04 +00:00
destradaa
e1a5144a1d Cherry-pick: Add callback-based support for HW Activity Recognition.
Add a callback-based mechanism for GmsCore to connect to Hardware Activity
Recognition. This allows GmsCore to stop polling to identify if the Android
platform supports the functionality or not.

Bug: 17112184
Change-Id: I8f9459cbd15eecd70f6919c6551e6f7a663c732f
2015-08-24 11:43:27 -07:00
destradaa
614612edb5 Disable AR HW when client binder dies.
Ensure that activities are unregistered from AR HW when the client's
binder dies. This clean up is required to prevent AR HW to keep active
when there are no clients listening for events.

Bug: 19894637
Change-Id: Iccd609cf1d2d4a4453c7a96cb8645b61639c3234
2015-08-24 11:02:52 -07:00
Eino-Ville Talvala
6960966f17 am 8c0104ef: am b5a913f9: am f99eba07: am ec2efb9c: am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
* commit '8c0104ef9fe5152c742a456c564c6588878e7645':
  Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 07:24:08 +00:00
Eino-Ville Talvala
ec2efb9cac am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
* commit '08b12dfba630659601972f0d857b6580fdae4313':
  Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
2015-08-22 05:38:01 +00:00
Eino-Ville Talvala
08b12dfba6 Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev 2015-08-22 05:33:26 +00:00
Eino-Ville Talvala
7ca1f243b8 am cf620038: am 68f46013: am 00ca835d: am e5b4c3d5: am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
* commit 'cf620038f4af0fec5980fd9ef8e9234cfaf7670c':
  Camera: Fix depth documentation issues
2015-08-22 01:38:25 +00:00
Jim Miller
c7506b3718 am e271d91e: am 7225af94: am c66a0db2: am 1bbc2750: am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
* commit 'e271d91e5f4a3941b654d41c87cb88f812a5d711':
  Fix type-o in FingerprintManager documentation
2015-08-22 01:22:18 +00:00
Eino-Ville Talvala
2e3215c9f6 Camera: Add support for notifying NFC stack when camera is active
On some devices, NFC full poll operation and camera operation
interfere.  Add a system property ro.camera.notify_nfc.  When set to >
0, the NFC adapter will be notified to disable polling whenever the
camera is active.

Bug: 23393557
Change-Id: I7e22018900970cbbd3d34bd8b3974e0b1cc98a8d
2015-08-21 17:41:47 -07:00
Eino-Ville Talvala
e5b4c3d5f3 am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
* commit 'a7dde2e89ec9a8c0ce5460d4f57d1e561f16520f':
  Camera: Fix depth documentation issues
2015-08-22 00:25:38 +00:00
Eino-Ville Talvala
a7dde2e89e Merge "Camera: Fix depth documentation issues" into mnc-dev 2015-08-22 00:14:13 +00:00
Eino-Ville Talvala
315bc09715 Camera2: Legacy: Lock down surface sizes before creating EGL surfaces
This ensures that sizes don't change after being initially inspected,
and/or stale size information isn't reused incorrectly.

Bug: 22092273
Change-Id: I5b26ea53977da4c1412e476d06d94aa791846393
2015-08-21 16:31:58 -07:00
Jim Miller
1bbc2750bb am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
* commit '74d9c2aad1bcd52933a8dba7752b28e9aef1902d':
  Fix type-o in FingerprintManager documentation
2015-08-21 22:11:30 +00:00
Jim Miller
5f69ca3be3 Fix type-o in FingerprintManager documentation
Fixes bug 23274133

Change-Id: I15607d0e64c0b11d36d0e0d47ea88c42101e4dde
2015-08-20 05:06:36 +00:00
Eino-Ville Talvala
abf0b8b0a8 Camera: Fix depth documentation issues
- Correct spelling of quaternion
- LENS_INTRINSIC_CALIBRATION and LENS_RADIAL_DISTORTION were not
  linkifying correctly

Bug: 23360503
Change-Id: I9c5acc0087d7115548b75ccfa1bc1eb1866557b2
2015-08-19 16:21:15 -07:00
Chien-Yu Chen
b6aa2fdb5d am 84551d61: am 6fdab993: am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev
* commit '84551d61fd4942aa4afb677ea3ae6ce7674c866c':
  Camera2: Handle surface size change
2015-08-19 21:07:43 +00:00
Chien-Yu Chen
c3aa7f3a75 Merge "Camera2: Handle surface size change" into mnc-dr-dev 2015-08-19 20:40:11 +00:00
Jim Miller
4ea5152bd8 am 849b9e58: am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev
* commit '849b9e58d6775a393f7d86a6305b658c6af9d16f':
  Reset fingerprint lockout timer when strong auth is used.
2015-08-19 02:21:58 +00:00
Chien-Yu Chen
828adbba24 Camera2: Handle surface size change
When comparing if two OutputConfigurations are equal, also check
the width, height, format, dataspace when the output configurations
were created. With this, CameraDeviceImpl knows that the surface has
changed sizes and will reconfigure the stream.

Bug: 12250682
Change-Id: Ie5965d242b2017b87a76d26cdc2f6b700082e002
2015-08-18 16:06:54 -07:00
Jim Miller
e0507bbbf9 Reset fingerprint lockout timer when strong auth is used.
Fixes bug 22565462

Change-Id: I4842877839845e7fe103396d8ca8104928568c04
2015-08-18 13:01:31 -07:00
Ruben Brunk
cbb6c16fe6 am 6f4f94ae: am 305680d6: am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev
* commit '6f4f94ae60129be8052ae3b1c4fd9b83a4729073':
  Add experimental camera session prepare API.
2015-08-17 18:01:20 +00:00
Ruben Brunk
c57f309a1b Merge "Add experimental camera session prepare API." into mnc-dr-dev 2015-08-17 17:28:12 +00:00
Eino-Ville Talvala
db86989dfc am 3a94b2d2: am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev
* commit '3a94b2d22e8346a884b2521f7e7682f2953d1515':
  Camera2: Add camera type to getNumberOfCameras.
2015-08-16 03:03:29 +00:00
Ruben Brunk
7ed1aaa369 Add experimental camera session prepare API.
Bug: 18949148
Change-Id: I35fde35436ae5bebab3c912243e621285307c211
2015-08-14 16:47:51 -07:00
Eino-Ville Talvala
5717612ba9 Camera2: Add camera type to getNumberOfCameras.
Do not list strange cameras in old API; ensure new API gets all
cameras.

Bug: 23194168
Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3
2015-08-14 14:52:57 -07:00
Eino-Ville Talvala
b92e3968b0 am 159a16ab: am f21ecd03: am 6986410a: am 5679800f: am 242ff8a8: Merge "Camera: Fix framework bugs with DEPTH-only camera devices" into mnc-dev
* commit '159a16ab79588d71aee5a10b1a4cd4a7f360ed9d':
  Camera: Fix framework bugs with DEPTH-only camera devices
2015-08-12 21:02:52 +00:00
Eino-Ville Talvala
72064af7e7 Camera: Fix framework bugs with DEPTH-only camera devices
Mostly due to no standard stream configurations being defined,
and for the correct overrides for DEPTH_POINT_CLOUD format.

Bug: 20537722
Change-Id: I8a18f5f68697a09dcc4d7555e51728193fe7f333
2015-08-11 15:04:56 -07:00
Yasuhiro Matsuda
48b9a7c70a Broadcast ACTION_USB_STATE only if necessary.
Modify UsbDeviceManager.updateUsbStateBroadcast to broadcast
ACTION_USB_STATE intent only when any of the USB states have
changed.
By doing this, the processes that receive ACTION_USB_STATE intent
(e.g. android.process.media) are not launched during boot
unnecessarily.
This change reduces boot time by about 200 ms.

BUG: 22163689
Change-Id: I1853a23b0263d9ff608b02d6bc98fe58f584cc19
2015-08-07 17:26:41 +09:00
Nick Kralevich
1913ae958c am 8ad7c8f9: am 94933e43: am 2eafb06f: am b2c71814: am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev
* commit '8ad7c8f9553611798fa39ff20cea3313c5b64922':
  UsbDeviceManager: fix b/21429947 regression (try #2)
2015-08-04 21:29:21 +00:00
Nick Kralevich
1a008c1ca0 UsbDeviceManager: fix b/21429947 regression (try #2)
As discussed in b/21429947 (commit
674019065b), MTP must always be
enabled, even if access to the underlying MTP data is disabled.
Otherwise, Android will not enumerate on the USB bus, and won't
receive notifications from the kernel about USB state changes. This
effectively prevents using MTP functionality on user builds, or
on userdebug/eng builds with adb turned off.

Always ensure that MTP is the default driver mode.

Move the DISALLOW_USB_FILE_TRANSFER filtering of mUsbDataUnlocked from
setting time to the time we post the sticky broadcast.

Remove isUsbDataUnlocked(). It essentially duplicates data in the sticky
broadcast.

Bug: 22447614
Bug: 21429947
Change-Id: I9d0d94cadbf6db6281ebd77bfb7162f9d06520c2
2015-08-04 10:36:37 -07:00
Ruben Brunk
f489020fed am 1055dbe4: am a9b4ed9e: am 20733ba9: am b1286a7a: am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev
* commit '1055dbe46927b1dfab84a08550f1fa3a09bf84cd':
  Make vendor keys visible in Camera2 java APIs.
2015-08-03 16:45:43 +00:00
Ruben Brunk
7469060e78 Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev 2015-08-03 16:09:07 +00:00
Dianne Hackborn
f6f1a7ec99 am 628b4125: am bc2a8843: am b97c5ddd: am 9b36f526: am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
* commit '628b4125843b93dc7f3ed0c9bbea76ff470d2eed':
  Change MNC codename to just M.
2015-08-01 17:53:09 +00:00
Ruben Brunk
c620eb7e86 Make vendor keys visible in Camera2 java APIs.
- Add vendor keys to getKeys() calls for CameraCharacteristics,
  CaptureRequest, and CaptureResult.
- Vendors can specify whether custom keys show up by listing
  visible keys in the REQUEST_AVAILABLE_RESULT_KEYS field.
- Vendor key types are always treated as a primitive (or Rational)
  array type corresponding to one of the valid types for
  a camera metadata entry.

Bug: 22067625
Change-Id: I6e7dd3db7a8bf533c2ec15ff69ca38824134e971
2015-07-31 17:14:18 -07:00
Dianne Hackborn
0e3de6caca Change MNC codename to just M.
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
2015-07-29 15:20:21 -07:00
destradaa
6e2fe75624 Add callback-based support for Hardware Activity Recognition.
b/17112184

Add a callback-based mechanism for GmsCore to connect to Hardware Activity
Recognition. This allows GmsCore to stop polling to identify if the Android
platform supports the functionality or not.

Change-Id: I8f9459cbd15eecd70f6919c6551e6f7a663c732f
2015-07-27 13:40:21 -07:00
Jorim Jaggi
740452e875 Touch, wake and unlock
- Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent
the device from sleeping.
- If we get a successful fingerprint, wake the device up, immediately
dismiss the keyguard and tell PWM that we kicked off our frame that
will represent the correct state.
- PWM then waits for this frame to be drawn, and then turns on the
screen, which results in unlocking directly to the previsouly
opened app.

Bug: 21855614
Change-Id: I5f43df17fa5e4e9c6a6392eef4a4590b07df4f96
2015-07-20 23:52:20 +00:00