Commit Graph

3207 Commits

Author SHA1 Message Date
Xin Li
5c4d37fc17 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Bug: 141248619
Change-Id: I078f35ceef06ae7d08c5de385fd023c71c1ecbac
2019-10-14 22:54:53 +00:00
Dmitry Shmidt
225b9d90c2 Merge changes If9068025,I728e5bf9,I9d41169d
am: 3b6a00ec3c

Change-Id: I30952395f276309ad683f61743ed3b382370541d
2019-10-02 13:57:40 -07:00
Dmitry Shmidt
d6cf4d986b InputManager: Add isMicMuted() helper
Bug: 141192769
Test: Manual

Change-Id: I9d41169d1859e311f8824fc4990b7c875e02abf1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2019-09-27 11:09:02 -07:00
Madhava Srinivasan
a40f432ac6 Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService"
am: 4efb0c510d

Change-Id: Ic60d7d5bf75288f9f6cdf02d414bf69dbfe74159
2019-09-13 10:24:22 -07:00
Madhava Srinivasan
154e0193ce Honor HDMI_CONTROL_ENABLED setting in AudioService
This change updates how AudioService is updated of changes to Hdmi Cec
status (enable/disable) and availablity.

Bug: 138956107
Bug: 138373017
Test: Android TV STB: make; flashall;Volume -/+; HDMI control enable/disable.
Change-Id: Iaf83a45206be076858e13d113ba772ed5c59ef60
Merged-In: Iaf83a45206be076858e13d113ba772ed5c59ef60
2019-09-12 22:14:59 +00:00
Xin Li
d57e959e71 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
2019-09-10 11:16:29 -07:00
Aurimas Liutikas
00be951a08 Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Merged-In: I109260842cfc25f06e40694997fcbb4afa02c867
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-30 00:14:44 +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
Brian Duddie
6b15b773a3 Merge "docs: Correct sensor runtime permission documentation" into qt-dev am: 119f1220cd
am: 7eeb6f60f9

Change-Id: Ic6e8d2b490b79b9c62cd374a28fb04504fb34bcc
2019-08-14 13:23:37 -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
Kevin Chyn
68a997fac1 Merge "Do not use canAuthenticate() to check if user can reset lockout" into qt-r1-dev
am: 8f0cd6547c

Change-Id: Ibf345cd218ed7ab1b1cb136c9d906af85a1025b4
2019-07-26 18:10:12 -07: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
c229a940cb Merge "Disable bypass and bouncer delay when no face auth" into qt-r1-dev
am: f41cc30658

Change-Id: I367b3ef7d3a596e15972af1f047fd291f92e56b0
2019-07-18 17:20:17 -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
6c848ed8b7 Merge "Always send userId to FaceService" into qt-r1-dev
am: e5c0b58738

Change-Id: Icaab5dcf538c6c79182951cb0d255bb777bf4a54
2019-07-03 16:14:33 -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
c88ead7d18 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev am: 6da414a8f6
am: 028b5789b6

Change-Id: Ie19cfb44eaf5d958778633ba8f2b4881b722b1b4
2019-06-28 18:22:20 -07:00
Shuzhen Wang
6f14111467 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev
am: 6da414a8f6

Change-Id: I2ade92a130cc6267a51802633f970d906891d5a6
2019-06-28 17:48:51 -07: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
Edgar Wang
aa9010894b Merge "Allow wake_lock_screen when AOD is off" into qt-r1-dev
am: 98a51d1080

Change-Id: Ia5aebe8d37a7c375137dc0c4895da62a6ed305cc
2019-06-28 14:30:25 -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
e8ff13376f Merge "Camera: block session init callback until ctor returns" into qt-dev am: 0e1eecd080
am: 0aa57fe073

Change-Id: I26ef69e151344e4ff1c42705b8841f0862802631
2019-06-25 10:08:45 -07:00
Yin-Chia Yeh
da073b4ac1 Merge "Camera: block session init callback until ctor returns" into qt-dev
am: 0e1eecd080

Change-Id: I915982209508646f15aeb0e3f219e5c950ebfa5f
2019-06-25 09:53:03 -07: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
0d9b47977b Merge changes I96ad00cb,I2b1193b9,I2850007f into qt-r1-dev
am: 24c57b6a70

Change-Id: I7cb53490bc94631432bfd9d1cb1511f0665468bc
2019-06-13 21:57:57 -07: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
c4320f393f Merge changes from topic "face-challenge-bug" into qt-r1-dev
am: 01462c0b95

Change-Id: I86587feb4d6a1e845cf605c8e5b6536d10f1b479
2019-06-12 11:04:31 -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
985f1299cf Merge "Clarify documentation for sensor placement" into qt-dev
am: 6e9c0741b5

Change-Id: I56695e9ea76f802b171c47fbb3f2dead651eb697
2019-06-05 13:53:01 -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
0c65fb0931 Merge "Camera: Handle hidden physical camera without camcorder profile" into qt-dev
am: 3960d2232d

Change-Id: I0be4d73cb018510ca49a498a895ac5aacf4463eb
2019-06-01 18:49:56 -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
Emilian Peev
54d7219b0c Merge "Camera: Always return 'null' for unsupported formats" into qt-dev
am: c7c173389a

Change-Id: I70498dcc38c16912230eb28f2975cd758f12e694
2019-05-17 15:17:49 -07:00
Shuzhen Wang
400c6fc4ee Merge "Camera: Handle out-of-order frameNumber for ZSL requests" into qt-dev
am: 34bc57f738

Change-Id: If601700de8ea43d1bf1538984951b0ec76151f88
2019-05-17 14:55:46 -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
c9fe56e893 Merge "Camera: Fix some documentation typos" into qt-dev
am: ee0d8180b6

Change-Id: Ib774bda31bd6aee67eaa88f8e840ba5930d6d9b3
2019-05-16 12:23:44 -07: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
29e86faf4e Merge "Validate vendor display color modes" into qt-dev
am: 1da3d01b5e

Change-Id: Iad3419fbbb43177bb137c17c45b34f494d34ff8b
2019-05-08 11:12:24 -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
Brian Stack
2e9b2b31a1 Merge changes from topic "step_event_permission" into qt-dev
am: 76d9f44133

Change-Id: I595aac545678b7059c817c62a73ff88a473bf556
2019-05-03 09:31:38 -07:00