Commit Graph

2709 Commits

Author SHA1 Message Date
Kevin Chyn
082c201438 Merge "FaceManager removal callback should propagate remaining" 2018-06-30 00:56:32 +00:00
Kevin Chyn
7e88d113d6 FaceManager removal callback should propagate remaining
Fixes: 110994796

Test: builds
Change-Id: I9a82a50a8bbd4b0c21a2acef33c9ec3fdff5c7f8
2018-06-29 12:57:01 -07:00
TreeHugger Robot
43ef2a1b69 Merge "Stop invoke initAppOps in Camera default constructor." 2018-06-28 03:28:32 +00:00
Kevin Chyn
02bcebede4 Merge "6/n: Have FaceService extend BiometricService" 2018-06-27 22:09:01 +00:00
Kevin Chyn
a56dff7339 6/n: Have FaceService extend BiometricService
In the Service layer, this change is pretty much the same as ag/4340638.
FingerprintService already extends BiometricService which contains all
of the common code. FaceService now does the same after this change.

Updated the Manager layer to use the infrastructure added in P, namely
  - Private APIs for BiometricPrompt
  - Removed FaceManager#CryptoObject, use biometrics/CryptoObject directly
  - Few other BiometricAuthenticator things

Bug: 110387294

Test: enrolling FP still works
Test: removing FP still works
Test: changing FP name persists across reboots
Test: enumerating still works (extra framework fp, extra hw fp)
Test: keyguard still receives lockout reset callbacks

Change-Id: I2195b08e28d024a120df56fe87b0dd4f9b96505a
2018-06-27 11:31:03 -07:00
Daichi Hirono
cb63c640cd Stop invoke initAppOps in Camera default constructor.
Camera default constructor does not create the underlying native camera
object. Thus calling _enableShutterSound after the default constuctor
causes application crash.

Bug: 80498247
Test: Manually modify the code to return MODE_IGNORED for
      AppOpsService#checkAudioOperation() and to return false for
      CameraManager#supportsCamera2ApiLocked. Then start voice call in
      Hangouts.

Change-Id: Id738c4d46a8e3625bc3b1142b11acac9cfb0b603
2018-06-25 02:23:13 +00:00
Emilian Peev
18333503de Merge "Camera: Update surface sharing format restrictions" into pi-dev am: a749cd584e
am: 8544a07eac

Change-Id: I4da1d84141de7fa5974ff7594318bfa237b7850c
2018-06-22 17:31:37 -07:00
TreeHugger Robot
a749cd584e Merge "Camera: Update surface sharing format restrictions" into pi-dev 2018-06-23 00:11:04 +00:00
TreeHugger Robot
abe78cd313 Merge changes from topic "biometrics-face"
* changes:
  5/n: Move FaceService to biometrics directory
  4/n: Add face authentication framework
2018-06-22 18:44:27 +00:00
Gilad Bretter
cb51b8b847 4/n: Add face authentication framework
This change is cherry-picked and rebased from AOSP
https://android-review.googlesource.com/c/platform/frameworks/base/+/660242

Add face recognition as an identification method, following fingerprint
design. Unlike fingerprint, only one face template can be enrolled per
user, and a vendor message is passed from the HAL all the way to the
client callback to allow GUI indication about the enrolled face
templates.

Add FaceAuthenticationManager and FaceService.
Add face authentication capability to TrustManager and Keyguard.
Modify TrustManager and KeyguardUpdateMonitorCallback fingerprint code
to support generic biometric method to eliminate duplications.
Add BiometricSourceType enum to keep track of the specific biometric
method.

Test: biometric authentication still works on the device

Fixes: 110385761

Change-Id: I5d04fe69a112c13d3ef7330b9c08c146e36c5335
Signed-off-by: Gilad Bretter <gilad.bretter@intel.com>
2018-06-21 17:00:07 -07:00
Yuriy Romanenko
eeb19d2563 camera2: Fixed typos in StreamConfigurationMap.java
Test: Looks better

Change-Id: I1fb78275d992423dfba892c471a17d02d69b2087
2018-06-19 19:12:54 -07:00
Android Build Merger (Role)
b7d1130901 [automerger] Merge "Camera: codegen doc update" into pi-dev am: 941189bf28 am: f1558d2929
Change-Id: Iad180583db4457b41dc9c30a6a80ce46ef28a085
2018-06-19 20:37:58 +00:00
Emilian Peev
470c698c5a Camera: Update surface sharing format restrictions
Surface sharing supports all formats except jpeg and
RAW private.

Bug: 110412079
Test: documentation builds without errors.
Change-Id: I72c5d744fed1b62eedd7a83522021ebad17e49b7
2018-06-19 18:27:59 +01:00
Yin-Chia Yeh
6c73e409fc Camera: codegen doc update
Test: N/A. Doc update
Bug: 109666939
Change-Id: I2bd176a7f5ada755c8a79201d142a98131e2e82c
2018-06-18 16:18:34 -07:00
Aurimas Liutikas
dc309f26f8 Fix broken links in @see tags in framework docs.
doclava was accidentally suppressing all these broken links
in @see tags. This CL fixes issues so we can start enfocing
checks for broken @see links.

Test: make docs
Bug: 80589960
Change-Id: I9c56841d9af111cb72e9a309bbe1bdcd31c80553
2018-06-05 14:44:30 -07:00
Aurimas Liutikas
62786b4431 Merge "Fix broken links in @see tags in framework docs." 2018-06-01 17:16:09 +00:00
Aurimas Liutikas
7f6953369a Fix broken links in @see tags in framework docs.
doclava was accidentally suppressing all these broken links
in @see tags. This CL fixes issues so we can start enfocing
checks for broken @see links.

Test: make docs
Exempt-From-Owner-Approval: Fixing @see javadoc link issues that are currently completely broken
Change-Id: I767e9fb9842494e5eccef2a7bdeee3877c488b5d
2018-06-01 17:15:55 +00:00
Yin-Chia Yeh
47eade3d32 Merge "Camera: add new detailed error callback" into pi-dev am: d4c5d1e448
am: e384ef8768

Change-Id: I51f4468eb6ac33a861459be2850554a7e0117a4a
2018-05-31 17:23:42 -07:00
Shuzhen Wang
f61a9e4417 Merge "Camera: Document getNumberOfCameras behavior for logical camera" into pi-dev am: fe8c263011
am: 7696265ef6

Change-Id: I5e5ab8aaf98e55a2ebd512b41b8caa25c8232024
2018-05-31 17:17:39 -07:00
TreeHugger Robot
d4c5d1e448 Merge "Camera: add new detailed error callback" into pi-dev 2018-05-31 21:11:24 +00:00
Yin-Chia Yeh
a07cd32684 Camera: add new detailed error callback
For the legacy shim layer to tell the difference between evction
and disable error.

Test: CTS CameraEvictionTest + IdleUidTest
Bug: 77486868
Change-Id: I5b68f55460287634903c9b8b42188d9dec8744d5
2018-05-31 12:24:55 -07:00
Shuzhen Wang
e7d3cd0a76 Camera: Document getNumberOfCameras behavior for logical camera
For camera1 API, framework only exposes one camera id for every
logical/physical camera id group. Document this behavior accordingly.

Test: Build
Bug: 80075565
Change-Id: I32c2de84d27a603d485014255bf1fad5031aa08e
2018-05-31 12:21:37 -07:00
Shuzhen Wang
865c73c0ac Merge "Camera: Clarify multi-camera id selection logic" into pi-dev am: 568ccfe0b6
am: 5116500c9d

Change-Id: I3fcea94d5f0cbccef69e45a6ccd98f1f60ed989b
2018-05-25 08:52:47 -07:00
TreeHugger Robot
568ccfe0b6 Merge "Camera: Clarify multi-camera id selection logic" into pi-dev 2018-05-25 15:27:43 +00:00
Justin Yun
eecd170c62 Merge "Merge "Camera: Use fallback key if the requested key returns null" into pi-dev am: 062c050d01" into pi-dev-plus-aosp
am: c7a55ad418

Change-Id: I862b506697883856e6ae88a0d6c9cc90e056758f
2018-05-24 16:14:07 -07:00
Shuzhen Wang
a57c274fc4 Camera: Clarify multi-camera id selection logic
Test: Compile
Bug: 80075565
Change-Id: I12d95b7b0248ab8c3e8fb9e42cac3ed6475e499b
2018-05-23 11:53:09 -07:00
Justin Yun
f01e40c5e1 Camera: Use fallback key if the requested key returns null
If the key returns null, try with the fallback key to get the values.
This is to support old key names for old camera hals.

Bug: 79183654
Test: Launch GCA in P and P+OMR1 walleye devices.

Change-Id: I1d55cc53b159401d4cd47da9a02f174cb6cb9e5e
2018-05-18 21:27:05 +09:00
Jiabin Huang
a1ef95f6e6 Merge "Fix shutter sound cannot enable." into pi-dev am: 065df1d75b
am: b64d756f08

Change-Id: Ib9bd7eeeb5b5b50e83eaf51554c9e19b12f880f6
2018-05-09 14:03:54 -07:00
Jiabin Huang
065df1d75b Merge "Fix shutter sound cannot enable." into pi-dev 2018-05-09 20:43:14 +00:00
android-build-team Robot
e798fc28f6 Merge "Camera: Specify session parameter build requirements" into pi-dev am: 9856d151f2
am: 4ee5e1d632

Change-Id: Iabd040574e5b9d768e7f19be55127046527b1e3d
2018-05-09 01:29:56 -07:00
jiabin
e059e45b05 Fix shutter sound cannot enable.
Bug: 79307231
Test: run cts and take picture with/withour dnd mode.
Change-Id: I9d4166d07b38ffae735aa63dad075bdb2def9a5a
2018-05-08 13:16:50 -07:00
Emilian Peev
0c227d47cc Camera: Specify session parameter build requirements
Session parameters are subset of the supported capture
request parameters. They are passed as part of the capture
session intitialization and only require the initial session
parameter values. Update the documentation and make clear that
additional outputs, tags etc. should not be passed when building
the session parameter capture request object.

Bug: 79225608
Test: Documentation builds
Change-Id: Id2651ea1d8dc8e3ebd9ebfca84eca2bb67694bf4
2018-05-08 09:28:10 +01:00
android-build-team Robot
a0e250e0d2 Merge "Add OP_PLAY_AUDIO to control shutter sound." into pi-dev am: da8e229b9c
am: 870d327b80

Change-Id: Ie9d04bfb3869b9103919d3c90d0b86ae13769e79
2018-05-01 17:19:50 -07:00
android-build-team Robot
da8e229b9c Merge "Add OP_PLAY_AUDIO to control shutter sound." into pi-dev 2018-05-01 23:56:12 +00:00
Kevin Chyn
09842ff5e9 Merge "refactored Log statements to Slog" into pi-dev am: 14de2930ba
am: 0a6d44f62e

Change-Id: I5b79fe9988db43586de268312f1898e27e2fb762
2018-05-01 16:48:42 -07:00
Joshua Mccloskey
d4390a52e5 refactored Log statements to Slog
Test: it builds
Change-Id: I9fdc5ad6767b02f42b768c1709b22d9f4d2d4e6b
Fixes: 76183279
2018-04-30 17:36:54 -07:00
Gene Karshenboym
92a7ecf0ef Merge "Implement RadioMetadata.toString." into pi-dev am: 1ae7fd5f44
am: 7cacc1fb80

Change-Id: I58d09dee7557a89432144805e875af45f3562fd7
2018-04-30 16:57:19 -07:00
Tomasz Wasilczyk
dd2e6c502f Implement RadioMetadata.toString.
This is required for metadata debugging.

Bug: 78885613
Test: build, run radio, watch logs
Change-Id: I63393bf555ede396a04f50897490049568b089dd
2018-04-30 10:40:39 -07:00
android-build-team Robot
ea11c848af Merge "camera2/legacy: Fix expected errors on eglSwapBuffers" into pi-dev am: a973d530df
am: 437e39316b

Change-Id: I4d2f040413063135397f71fc684ba0375b86358a
2018-04-27 11:41:09 -07:00
android-build-team Robot
a973d530df Merge "camera2/legacy: Fix expected errors on eglSwapBuffers" into pi-dev 2018-04-27 18:24:00 +00:00
Lloyd Pique
df34b49fa2 camera2/legacy: Fix expected errors on eglSwapBuffers
SurfaceTextureRenderer::swapBuffers interpreted EGL_BAD_SURFACE as
indicating an abandanoned buffer queue. But the EGL 1.4 lists additional
errors that also indicate extreme failure: EGL_CONTEXT_LOST, and
EGL_BAD_NATIVE_WINDOW.

Discovered while debugging CTS test
android.hardware.camera2.cts.RobustnessTest#testAbandonRepeatingRequestSurface
on ARC++ x86 boards.

Test: cts-tradefed/android.hardware.camera2.cts.RobustnessTest#testAbandonRepeatingRequestSurface
Bug: 64496778
Bug: 36063477
Change-Id: I782f2c923aa5ff2442bbcf3dfb09861e129a2872
(cherry picked from commit 3511f99cf986a9fe7a67a8aee301e05f1be07f62)
2018-04-26 15:31:12 -07:00
jiabin
503e1fdcd1 Add OP_PLAY_AUDIO to control shutter sound.
The camera will play shutter sound through native layer instead of Java
layer. That will cause shutter sound to bypass AppOps check. Add
OP_PLAY_AUDIO checking to avoid shutter sound playing while DnD.

Bug: 78136756
Test: Taking picture in Message with enable/disable DnD.
Change-Id: Iba5e7ab19cf5565ba3f074d2aba194b60e18265f
2018-04-20 11:51:09 -07:00
Tomasz Wasilczyk
9c37eae3b0 Merge "Don't check program selector's type for equality." into pi-dev am: a2015451a7
am: 74a2955d35

Change-Id: I2bcfc30020e0ee9bdee8e38dc124c9ea49df5ceb
2018-04-20 07:11:25 -07:00
Tomasz Wasilczyk
a2015451a7 Merge "Don't check program selector's type for equality." into pi-dev 2018-04-20 13:49:39 +00:00
Tomasz Wasilczyk
71791f95c6 Don't check program selector's type for equality.
As the comments of the whole class says, primary ID is the field used
for checking for equality of the selectors. Current implementation also
checks program type, which is a deprecated field that can be inferred
from primary ID.

Test: open car.Media, add AM station to favorites
Bug: 78296701
Change-Id: I0423f831c2fdca2d1d126ed8a3b8fe40f28022ac
2018-04-19 14:23:54 -07:00
Kevin Chyn
a65c11d041 Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev am: 54926ba6a9
am: 8566a544c6

Change-Id: I881dcdd4a1da08173e74f5b831c716decf21c752
2018-04-17 19:19:24 -07:00
Kevin Chyn
54926ba6a9 Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev 2018-04-18 01:53:39 +00:00
Kevin Chyn
58a0d51472 Don't delay the FINGERPRINT_ERROR_CANCELED message
Test: tested with test APK

Change-Id: Ic975870c6f815b5f7dfa4c7f2d8bf5554fbb1c5b
Fixes: 78185698
2018-04-17 13:50:53 -07:00
Hidenari Koshimae
89a6da9211 Merge "Camera: Fix a description for MONOCHROME camera capability" into pi-dev am: 8be1197c5d
am: 3995b3ff9c

Change-Id: I66a8d3f31cdaa0a96a4eb991f1f6ab7fb2e8a32c
2018-04-16 17:46:43 -07:00
Hidenari Koshimae
3a385f81a3 Camera: Fix a description for MONOCHROME camera capability
Test: Compile
Bug: 77902724
Change-Id: Ibb6a1d4b5f80a0c4d0e3f29625b03a827a3ed80c
2018-04-16 12:22:34 -07:00