Commit Graph

3181 Commits

Author SHA1 Message Date
Yin-Chia Yeh
f83a966064 Camera: fix NPE from bad requestID
This avoid NPE exception and accompanying logspam from binder
callbacks.

Test: N/A
Bug: 141250131
Merged-In: I729f4905c94698c95733570abe92ca3ba9163cc5
Change-Id: I729f4905c94698c95733570abe92ca3ba9163cc5
(cherry picked from commit 67bd78ad73)
2019-09-18 18:14:16 +00:00
Yin-Chia Yeh
3b93a85b6a Camera: fix NPE in buffer error callback
Check if the error stream has been removed first.
Also move some code in submitCaptureRequest so that access to
mConfiguredOutputs is within scope of mInterfaceLock, which
matches all other places accessing mConfiguredOutputs in the file.

Test: Camera CTS
Bug: 140374093, 140527066
Change-Id: I84921eb3a555f67a006548865f34502ab978e33b
2019-09-09 14:59:59 -07:00
Long Ling
5a570b3898 [DO NOT MERGE] Move device config high_refresh_rate_blacklist to display_manager
high_refresh_rate_blacklist belongs to smooth display feature. Move the
key from namespace window_manager to display_manager.

Bug: 139138964
Test: atest WmTests:HighRefreshRateBlacklistTest
Test: Manual adb shell device_config/dumpsys window
Change-Id: I3ae8ecce80ef97c4683a1c18ad81dc78456e9d57
2019-09-03 16:24:42 -07:00
Long Ling
736b3b278c Merge "DMD: Support 90hz only in the refresh rate zone" into qt-r1-dev
am: d44f2edc08

Change-Id: Id684830b35b90017be0d5e9fb7c3fe348ffc200f
2019-09-03 14:41:16 -07:00
Long Ling
73936631d5 DMD: Support 90hz only in the refresh rate zone
Also allow DeviceConfig to change the zone behavior
to 60 Hz only.

Change BrightObserver priority to be the lowest so application
request won't be overriden by BrightnessObserver

Bug: 139487676
Change-Id: I959550350c1ea72f764984226350ebc6e7de591c
2019-08-30 10:19:47 -07:00
Long Ling
dde6248065 DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager
Bug: 139138964
Change-Id: I077380583f0daf650b17832a6cec4919b41ac155
2019-08-23 13:00:53 +00:00
Long Ling
6f13f12213 DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager
high_refresh_rate_blacklist belongs to smooth display feature. Move the
key from namespace window_manager to display_manager.

Bug: 139138964
Test: atest WmTests:HighRefreshRateBlacklistTest
Test: Manual adb shell device_config/dumpsys window
Change-Id: I3ae8ecce80ef97c4683a1c18ad81dc78456e9d57
2019-08-21 10:45:29 -07:00
Long Ling
66e9298ac6 DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager
Bug: 139138964
Change-Id: I077380583f0daf650b17832a6cec4919b41ac155
2019-08-21 10:45:22 -07:00
Tomasz Wasilczyk
829187581f Move processing off of HIDL Binder
Bug: 138412770
Test: atest StartProgramListUpdatesFanoutTest
Change-Id: I51a89c5792a1938cfd6720a10b6830b8cf62b9cd
Merged-In: I51a89c5792a1938cfd6720a10b6830b8cf62b9cd
2019-08-20 12:36:04 -07:00
Brian Duddie
e1d3f8e84a Merge "docs: Correct sensor runtime permission documentation" into qt-dev am: 119f1220cd
am: 7eeb6f60f9

Change-Id: Ib01177a1863818238d5998628252dc5c4372e06d
2019-08-14 13:19:42 -07:00
Brian Duddie
7eeb6f60f9 Merge "docs: Correct sensor runtime permission documentation" into qt-dev
am: 119f1220cd

Change-Id: I380c1dab916509ac0878e8a60712e7f08e7451a5
2019-08-14 13:09:45 -07:00
Brian Duddie
0fcaef12c0 docs: Correct sensor runtime permission documentation
The ACTIVITY_RECOGNITION permission applies to TYPE_STEP_DETECTOR, not
TYPE_GEOMAGNETIC_ROTATION_VECTOR.

Bug: 139363621
Test: n/a, comment update only
Change-Id: Ibce74be1e704ded04ae710988d0e03df43ab1cf9
2019-08-13 18:48:26 +00:00
Tomasz Wasilczyk
06e534a3fb Don't crash trying to stop program list updates on already closed tuner
Bug: 130816005
Test: build and run
Change-Id: Ibb0af40165c6b330785ef208510ba654c5ee6ad7
(cherry picked from commit 136870f7f1)
2019-08-08 15:19:48 +00:00
Yin-Chia Yeh
1b1f14ebff Camera: fix getKeys impl for vendor keys
Test: partner testing
Bug: 137856586
Change-Id: Ie36db4f76e8b3d500aeea88d15e4e3295cc3d481
2019-08-02 22:14:40 +00:00
Kevin Chyn
27f9231e49 Do not use canAuthenticate() to check if user can reset lockout
canAuthenticate() is meant for apps so it will reflect the
FACE_UNLOCK_APP_ENABLED setting. If disabled, resetLockout will not be
run for that user.

Fixes: 138269776

Test: Disable unlocking for apps, get locked out, enter password.
      Lockout is reset now.

Change-Id: I5d7bf3abbac7c8982595d5733464a887ab5184ab
2019-07-26 13:10:47 -07:00
Lucas Dupin
7d95f154a0 Disable bypass and bouncer delay when no face auth
KeyguardUpdateMonitor#isUnlockWithFacePossible was returning true
when the user had disabled face unlock.

This was causing bypass to still be enabled (hiding all notifications)
and bouncer was also being delayed, even though we were not scanning.

Fixes: 134977472
Test: auth with bypass (toggling face auth setting on/off)
Test: auth without bypass (toggling face auth setting on/off)
Change-Id: I234eb303db87fe0dafa2073a9bdf819c665018d6
2019-07-18 14:24:08 -07:00
Kevin Chyn
e5c0b58738 Merge "Always send userId to FaceService" into qt-r1-dev 2019-07-03 02:07:49 +00:00
Shuzhen Wang
028b5789b6 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev
am: 6da414a8f6

Change-Id: Ic7abd99805b450f0a1d1acbd2a0cd03c185e3a83
2019-06-28 17:33:50 -07:00
Kevin Chyn
593e62640d Always send userId to FaceService
resetLockout may take longer on some devices, causing FaceSettings
setActiveUser to be overwritten. To be safe, invoke updateActiveGroup
whenever user-specific functionality is invoked from the upper layers.

Ideally setActiveUser + operation should be atomic. In the future perhaps
we could consider changing HIDL so each method is user-aware, but for now
this is the only thing we can do.

Fixes: 136264301

Test: Set up work profile on device, repeatedly do the following
      1) Go to settings, enroll face
      2) Back out, go back in, delete face
      3) Enroll face
      4) Delete face, go back out

Change-Id: Ic32587cd4613f2bfd71171df6b69fe6028812ca8
2019-06-28 13:27:45 -07:00
Shuzhen Wang
da189bddc2 Camera: Clarify manual capture behavior for logical camera
Test: Build and read docs
Bug: 136098496
Change-Id: I4a2e9ac66ef79379b9c50932ddc845f56d7d01b4
2019-06-27 10:29:38 -07:00
Edgar Wang
98a51d1080 Merge "Allow wake_lock_screen when AOD is off" into qt-r1-dev 2019-06-27 06:36:34 +00:00
Yin-Chia Yeh
0aa57fe073 Merge "Camera: block session init callback until ctor returns" into qt-dev
am: 0e1eecd080

Change-Id: I999510b0513b0b32a86af8e5460aa5688476e9f5
2019-06-25 09:45:42 -07:00
Yin-Chia Yeh
0e1eecd080 Merge "Camera: block session init callback until ctor returns" into qt-dev 2019-06-25 16:26:54 +00:00
Yin-Chia Yeh
8b9b9f065c Camera: block session init callback until ctor returns
To fix race condition where session init callback is executed
before the ctor finished (and mSessionImpl is initialized)

Test: manuall testing GCA
Bug: 134218348
Change-Id: I6985b489a8cb459d9b1dce4d56a9c3e97ceb366c
2019-06-24 11:32:34 -07:00
Lucas Dupin
7c7b8c28ca Allow wake_lock_screen when AOD is off
Also decoupling the settings, so they can be configured
separately.

Fixes: 135023656
Test: manual
Test: adb shell settings put secure doze_wake_lock_screen_gesture 0
Test: adb shell settings put secure doze_wake_lock_screen_gesture 1
Change-Id: I2138d5d06919b9c23428663e49381fc1b694e301
2019-06-17 23:56:52 +00:00
Kevin Chyn
29692c5e8b Return empty string when invalid error codes are received
Bug: 134857990

Test: Builds
Change-Id: I2850007f5aa5a00fa3ef7d95138200a3e6cec559
2019-06-13 16:28:44 -07:00
Kevin Chyn
28623b6d29 LSS must check canAuthenticate(userId) for correct user/profile
Bug: 134834442

Test: With unified challenge enabled and work profile non-enrolled,
      resetLockout is not invoked for work profile anymore

Change-Id: Ifb91df0ea66dbcd29d7f5fb648295b154074392c
2019-06-12 10:52:53 -07:00
Brian Duddie
086d840d74 Clarify documentation for sensor placement
Update documentation to be in sync with new language added to HAL
interface, which better explains the expected payload, format, and
usage.

Fixes: 133264933
Test: make docs, view HTML
Change-Id: Ib602674d395cb8c8e6431d23b051685c8d172560
2019-06-05 11:44:44 -07:00
Shuzhen Wang
aae389639d Camera: Handle hidden physical camera without camcorder profile
For hidden physical sub-camera, if there is no camcorder profile,
use stream configuration map to figure out maximum recording size.

Test: RobustnessTest
Bug: 133819902
Change-Id: Ie0e76b51b1942b6fd3612c0b849a07bbb5d205e9
2019-05-31 13:23:40 -07:00
TreeHugger Robot
c7c173389a Merge "Camera: Always return 'null' for unsupported formats" into qt-dev 2019-05-17 21:35:23 +00:00
TreeHugger Robot
34bc57f738 Merge "Camera: Handle out-of-order frameNumber for ZSL requests" into qt-dev 2019-05-17 21:20:44 +00:00
Emilian Peev
0105dfbe78 Camera: Fix some documentation typos
Bug: 132419505
Test: Successful build
Change-Id: Ifb610998422264f565a16eae005e7096a6a2f611
2019-05-15 12:00:13 -07:00
Emilian Peev
0fde6be448 Camera: Always return 'null' for unsupported formats
According to the API documentation, output size queries must
return 'null' in case the respective format is not supported.

Bug: 132594990
Test: Camera CTS
Change-Id: I832efe73dae8753baa635b359a68062f2ef63476
2019-05-15 11:12:19 -07:00
Shuzhen Wang
b45449b9bc Camera: Handle out-of-order frameNumber for ZSL requests
Allow the frame number of ZSL capture to be out of order compared to
reprocessing or normal captures.

Test: Camera CTS, 3P camera app sanity test.
Bug: 120604717
Change-Id: I6bc81dc522329153c0ea27c3409d7237470d1850
2019-05-10 12:35:45 -07:00
Christine Franks
c5f0d146db Validate vendor display color modes
Bug: 128607042
Test: atest FrameworksServicesTests:ColorDisplayServiceTest

Change-Id: I78dca7eeb9d4855007b5616b444b2b715860bed1
2019-05-06 12:26:08 -07:00
TreeHugger Robot
76d9f44133 Merge changes from topic "step_event_permission" into qt-dev
* changes:
  Update Step Detector and Step Counter docstring
  Add support for retrieving targetSdkVersion
2019-05-02 22:56:56 +00:00
TreeHugger Robot
6c7014dd52 Merge "Camera: Consider mPhysicalCameraId in OutputConfiguration comparison" into qt-dev 2019-05-02 21:10:59 +00:00
Shuzhen Wang
46c390a1c6 Camera: Consider mPhysicalCameraId in OutputConfiguration comparison
Test: Camera CTS
Bug: 131714581
Change-Id: Ifbd44a0cd16116311e0eef9c194dd90c9210952c
2019-05-02 11:08:22 -07:00
Brian Stack
fef1a81593 Update Step Detector and Step Counter docstring
Explicitly states that the Step Detector and Step Counter require the
android.permission.ACTIVITY_RECOGNITION permission in order to be
used.

Bug: 130640415
Test: Builds
Change-Id: I3c6bb00128343dff8dbb97c71e9fe2a912662ff0
2019-05-01 19:18:27 +00:00
Ian
fd4021c26a Add tracepoints for potential performance issues
Bug: 124521164
Test: Builds
Change-Id: Ie70f2aae6c5b2e70d9f6029281a761c872451337
2019-04-30 00:01:11 +00:00
Shuzhen Wang
062c22ba60 Camera: Relax BURST_CAPTURE FPS requirements
Allow resolutions larger than 24 megapixels to have fps lower than
10fps.

Test: Build
Bug: 129693371
Change-Id: Ie0403d80bf4c441e268d266eb30dacc2ea8184b9
2019-04-22 08:58:16 -07:00
TreeHugger Robot
c901e419e3 Merge "Camera: Clarify multi-camera RAW and FOV behaviors" into qt-dev 2019-04-17 23:23:29 +00:00
Shuzhen Wang
0fdc9358c6 Camera: Clarify multi-camera RAW and FOV behaviors
- RAW capability can exist for multi-camera even if physical cameras are
of different sizes/capabilities.
- FOV for all processes streams must be the same regardless of logical
or physical streams.

Test: Build and read docs
Bug: 118906351
Bug: 126220135
Change-Id: I14ab4844630a048e66a42ec3a776c87830565e49
2019-04-16 17:13:44 -07:00
Amy Zhang
64b51f91ff Merge "Resolve CEC related API requests from API Council" into qt-dev 2019-04-15 17:46:49 +00:00
Kevin Chyn
9b92030ad5 Merge "Authenticate with the correct user from KeyguardUpdateMonitor" into qt-dev 2019-04-12 21:10:23 +00:00
Kevin Chyn
8d2694a351 Authenticate with the correct user from KeyguardUpdateMonitor
Fixes: 130242795

Test: manual
Change-Id: I5c5e400de9d204d89abbe07bc6b3265dbc4ea973
2019-04-12 11:48:12 -07:00
Eino-Ville Talvala
9943f8db84 Merge "Camera: Document LEGACY not being allowed on new devices" into qt-dev 2019-04-12 18:11:06 +00:00
Amy
d23043a255 Resolve CEC related API requests from API Council
Test: manual
Bug: 128427908
Change-Id: I1c8cd3ed843c91ecb94076160fd1bd93295c619b
2019-04-12 00:55:29 +00:00
TreeHugger Robot
3fe3dc7f5f Merge "Update documentation for fingerprint -> biometric" into qt-dev 2019-04-11 21:25:52 +00:00
Eino-Ville Talvala
2a303a492b Camera: Document LEGACY not being allowed on new devices
Bug: 130315905
Test: Builds, docs look ok.
Change-Id: I9e1bd8561819f84419cac4d048085700b4694473
2019-04-11 00:42:36 +00:00