Commit Graph

3226 Commits

Author SHA1 Message Date
Lucas Dupin
0a201d09e0 Merge "Disable bypass and bouncer delay when no face auth" into qt-r1-dev am: f41cc30658
am: c229a940cb

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

Change-Id: I2ea9db58dc43c41dcbf35a93a363841043ecbe80
2019-07-03 16:30:21 -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
Amy
a28b24e245 Cache Physical Address in HdmiControlManageri on tx hotplug event
This cache will not be updated when device is plugged into a new port
or unplugged from the current connected device.

Test: manual
Bug: 131629012
Change-Id: I8043f51b94323471218616ab237abbde1e0777d2
(cherry picked from commit 0429af7fca7ca7191c5ea4987c00da97d1a7877c)
2019-07-02 21:09:20 +00:00
Amy Zhang
d12a1063ff Merge "Dump HdmiPortInfo port type" 2019-07-02 00:14:51 +00:00
Amy Zhang
9191d7c93c Merge "Do not switch to HOME activity when OneTouchPlay API is called" 2019-07-02 00:12:12 +00:00
Shuzhen Wang
27379787e2 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev am: 6da414a8f6 am: 028b5789b6
am: c88ead7d18

Change-Id: I72f1631555665ad31c989f3fa0945afda5a6586e
2019-06-28 19:55:08 -07: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
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
62f3c5c008 Merge "Allow wake_lock_screen when AOD is off" into qt-r1-dev am: 98a51d1080
am: aa9010894b

Change-Id: I85650270e8a7302642adaef64370166a10672e7a
2019-06-28 15:23:39 -07:00
Amy
41f726a9cd Do not switch to HOME activity when OneTouchPlay API is called
When OneTouchPlay is called, client side wants the current device to
stream its internal source. But this internal source could be Youtube or
Netflix or pure HOME screen. HDMI framework won't be able to tell the
difference here. We should leave this activity switch responsibility to
the client side.

Test: manual
Bug: 131601411
Change-Id: I55afec05462394fbb004a3037bec59ae0a78018e
(cherry picked from commit c7a701ef9a3cbc07afc75efdf9d2a80f5cb82305)
2019-06-28 21:34:38 +00:00
Amy
e95091c01a Dump HdmiPortInfo port type
Test: manual
Bug: 131718656
Change-Id: I6e249dc5c995abd13528472aa4d55851f8c46ea6
(cherry picked from commit 82265ec435e671b62805661e9ec80f4c9117a702)
2019-06-28 21:31:14 +00: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
cff1749e52 Merge "Camera: block session init callback until ctor returns" into qt-dev am: 0e1eecd080 am: 0aa57fe073
am: e8ff13376f

Change-Id: I2f5a51b279a67b53a5f0fc5ac0632ce0bf568595
2019-06-25 10:41:56 -07: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
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
TreeHugger Robot
f62b91043c Merge "Remove @Deprecated && @removed hardware methods." 2019-06-21 00:51:31 +00:00
TreeHugger Robot
0264147455 Merge "Camera: don't require (15, max) fps range for NIR camera" 2019-06-18 04:37:59 +00: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
Kweku Adams
26166043f6 Remove @Deprecated && @removed hardware methods.
The methods were marked @removed in Oreo. Finally removing it from code.
SensorDirectChannel.isValid is currently used by Roboelectric so it will
have to be removed separately.

Bug: 135214188
Test: Android builds
Change-Id: Ib357ad76654326d94f6873102de22451bf4f5b59
2019-06-17 14:15:40 -07:00
Kevin Chyn
534db6da6c Merge changes I96ad00cb,I2b1193b9,I2850007f into qt-r1-dev am: 24c57b6a70
am: 0d9b47977b

Change-Id: I2c1ac8af91b4fa9d4088cf8860f89ad86ebb2833
2019-06-13 22:21:30 -07: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
Yin-Chia Yeh
ae092f2a4f Camera: don't require (15, max) fps range for NIR camera
Test: manually check generated doc
Bug: 132307219
Change-Id: Ifdf120936a26708ad203c90557977e7b6c303f9b
2019-06-12 15:08:36 -07:00
Kevin Chyn
6dd258b9db Merge changes from topic "face-challenge-bug" into qt-r1-dev am: 01462c0b95
am: c4320f393f

Change-Id: I01d49673821f2f0b67239d9384785641ef85ade4
2019-06-12 11:25:49 -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
Al Sutton
0acd9c8fdb Merge "Add protection against an access-after-free issue if cancel() is called after a device connection has been closed." 2019-06-07 19:44:08 +00:00
Brian Duddie
cf2ff61cce Merge "Clarify documentation for sensor placement" into qt-dev am: 6e9c0741b5 am: 985f1299cf
am: fc06205561

Change-Id: I0a33e5c0f1a258d729fe06bbb8da6d6e44fa4fe4
2019-06-05 14:06:45 -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
Al Sutton
ca53d07afe Add protection against an access-after-free issue if cancel() is called
after a device connection has been closed.

Test: Existing tests will show if there is a chancel to cancel()
behavior expectations.
Fixes: 132319116

Change-Id: Ide7a41eca41b68868af93131dcd2155648e9fa8f
2019-06-04 09:06:03 +01:00
Shuzhen Wang
5c5e6da46d Merge "Camera: Handle hidden physical camera without camcorder profile" into qt-dev am: 3960d2232d am: 3cc5d8d876
am: 36d2c4211e

Change-Id: I4671e39b54657849753e6b1c8678a8a0912cc614
2019-06-01 18:59:59 -07:00
Shuzhen Wang
36d2c4211e Merge "Camera: Handle hidden physical camera without camcorder profile" into qt-dev am: 3960d2232d
am: 3cc5d8d876

Change-Id: Ie9591f5ea93465211fe99b8db0ae16f3f2af8264
2019-06-01 18:54:52 -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
Amy Zhang
98be786ea2 Merge "Exposing getPortInfo in HdmiControlService as an HdmiSwitchClient API" 2019-05-22 17:44:03 +00:00
Emilian Peev
be4d3d7d78 Merge "Merge "Camera: Always return 'null' for unsupported formats" into qt-dev am: c7c173389a am: 54d7219b0c" into qt-r1-dev-plus-aosp
am: 77be6638e5

Change-Id: I4d040080ffab3bc39a99eee64d6a26d39fd563e9
2019-05-17 22:36:48 -07:00
Shuzhen Wang
7bac066244 Merge "Camera: Handle out-of-order frameNumber for ZSL requests" into qt-dev am: 34bc57f738 am: 400c6fc4ee
am: 3958b32857

Change-Id: I1da19dcbfcb6aab0d326cb321c7fe99d39a23d60
2019-05-17 20:17:48 -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