Commit Graph

1668 Commits

Author SHA1 Message Date
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
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
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
Chien-Yu Chen
98977fa042 am aa9a27bb: Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev
* commit 'aa9a27bb9bbfb4bccf999a0d453f4f4d853aac36':
  Camera2: Update FAST mode for EE and NR
2015-07-17 17:06:02 +00:00
Eino-Ville Talvala
69508f494e am 6e8a551f: Merge "Camera2: Add hidden experimental tearDown method" into mnc-dev
* commit '6e8a551f9f7691e3d7ada46eeae5d2cc612d7938':
  Camera2: Add hidden experimental tearDown method
2015-07-17 17:05:54 +00:00
Chien-Yu Chen
aa9a27bb9b Merge "Camera2: Update FAST mode for EE and NR" into mnc-dev 2015-07-17 17:01:30 +00:00
Eino-Ville Talvala
14c09fa3c5 Camera2: Add hidden experimental tearDown method
Bug: 18949148
Change-Id: I6264d95a26ebf51cce6114c9a86b9561f7c60ab5
2015-07-16 14:55:26 -07:00
Chien-Yu Chen
9c9167efe2 Camera2: Update FAST mode for EE and NR
FAST for EE/NR modes may be the same as OFF for devices
whose EE/NR will slow down the capture rate.

Bug: 22486061
Change-Id: I162dc27a6ba6838fbbc1077dd346f4ff9bbacc43
2015-07-15 15:53:36 -07:00
Jeff Brown
0cb1cfdcc3 am 76c4c666: Add USB port manager.
* commit '76c4c6668a1486bc003ab0c585bb1f41d16e27a7':
  Add USB port manager.
2015-07-15 22:26:38 +00:00
Jeff Brown
76c4c6668a Add USB port manager.
Add some new internal APIs to enumerate USB Type C ports, query their
status, determine whether they support changing power or data roles,
and doing so.  The API also adds a new ACTION_USB_PORT_CHANGED broadcast
for port state changes.

The implementation includes a mechanism for simulating the behavior
of the USB stack.  See 'adb shell dumpsys usb -h' for details.

Note that the underlying kernel driver interface is still subject
to change but its behavior has been encapsulated as much as possible.

Bug: 21615151
Change-Id: I0c853ae179248a4550b3e60d02a7a7e65e4546b2
2015-07-15 11:34:29 -07:00
Yin-Chia Yeh
9d513cec7c am b42cb352: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev
* commit 'b42cb352a350bac198470f65125aa151ecacff13':
  Camera: clarify largest JPEG dimension expectation
2015-07-14 23:13:27 +00:00
Yin-Chia Yeh
b42cb352a3 Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev 2015-07-14 22:53:11 +00:00
Chien-Yu Chen
951e2633eb am 6eec00ec: Merge "Camera: Reconnect after camera service crashes" into mnc-dev
* commit '6eec00ecf456b8a24487828b6f515cccc465cc1a':
  Camera: Reconnect after camera service crashes
2015-07-14 21:18:22 +00:00
Jorim Jaggi
4cfdcf5b05 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: I0c43bcc9d334b509632704fb0c123ab3351edff2
2015-07-14 21:05:26 +00:00
Chien-Yu Chen
6eec00ecf4 Merge "Camera: Reconnect after camera service crashes" into mnc-dev 2015-07-14 20:48:56 +00:00
Chien-Yu Chen
0f69b4655f Camera: Reconnect after camera service crashes
Schedule a reconnection after camera service crashes if any client
registered a camera availability callback or torch status callback.

Bug: 407755
Change-Id: Iabe0bf713863898ca468cff59d4c97c66a802630
2015-07-13 17:46:04 -07:00
Aravind Akella
37511e35ae Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev 2015-07-13 18:21:37 +00:00
Aravind Akella
11fce8e8c5 Log full class name of the client activating sensors for better debugging.
Bug: 22076400
Change-Id: Ibb8e72cfb031651e803f2eaf4b6530f809c00b6b
2015-07-12 11:56:25 -07:00
Zhijun He
4fb81253ed Camera metadata: fix typos.
Bug: 22417740
Change-Id: I871b990da43132f4967faf7ee23a9a2d962c4320
2015-07-11 20:03:52 -07:00
Eino-Ville Talvala
639fffee62 Camera2: Reorganize high-speed recording API slightly
- Split off distinct high speed capture session class from base capture session
- Move createHighSpeedRequestList to CameraConstrainedHighSpeedCaptureSession

Bug: 21664295
Change-Id: I67d705fdeee1eaa6e5e3e1416771d5d0df642843
2015-07-10 00:56:18 +00:00
Jeff Brown
c1aebfa02c Merge "Clean up USB Manager and fix ADB." into mnc-dev 2015-07-09 20:03:29 +00:00