Commit Graph

3246 Commits

Author SHA1 Message Date
Brian Duddie
98c5f80c67 Merge "docs: Correct sensor runtime permission documentation" into qt-dev am: 119f1220cd am: 7eeb6f60f9 am: 6b15b773a3
am: b7fa2d8192

Change-Id: If0f620d197fd2b3e9c0faba5164710026b1c3f2d
2019-08-14 14:00:53 -07:00
Brian Duddie
b7fa2d8192 Merge "docs: Correct sensor runtime permission documentation" into qt-dev am: 119f1220cd am: 7eeb6f60f9
am: 6b15b773a3

Change-Id: Id7f05c7a0de12d8ee332be9f10cc8de9e6bdfef9
2019-08-14 13:33:40 -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
Tomasz Wasilczyk
8f892421d0 Merge "Don't crash trying to stop program list updates on already closed tuner" into qt-qpr1-dev
am: 48d3b7ce3e

Change-Id: I83d55ad34a1a5bbe977df97d2a3a4ce87780ccaf
2019-08-08 11:27:19 -07: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
TreeHugger Robot
0b31d6c000 Merge "Don't crash trying to stop program list updates on already closed tuner" 2019-08-07 23:08:25 +00:00
Tomasz Wasilczyk
136870f7f1 Don't crash trying to stop program list updates on already closed tuner
Bug: 130816005
Test: build and run
Change-Id: Ibb0af40165c6b330785ef208510ba654c5ee6ad7
2019-08-07 12:57:00 -07:00
Yin-Chia Yeh
f042ad8802 Merge "Camera: fix getKeys impl for vendor keys am: 1b1f14ebff" into qt-qpr1-dev-plus-aosp
am: d1e6177672

Change-Id: If317e03171bdb9ee87556fca89d7e3f363f8cddf
2019-08-06 03:07:42 -07:00
Yin-Chia Yeh
8251b2deea Camera: fix getKeys impl for vendor keys
am: 1b1f14ebff

Change-Id: Id8fd308714ea7bd53f088a951250e74b0c24d489
2019-08-06 02:17:53 -07: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
George Lu
cf9d622edc Merge "Fix RadioMetadata.hashCode()." 2019-08-02 21:37:40 +00:00
George Lu
bc2238ebcd Fix RadioMetadata.hashCode().
ag/7063548 implemented RadioMetadata.hashCode() by calling Bundle.hashCode(),
but that function uses the default implementation that uses the address
of the Bundle. As a result, two RadioMetadata objects that were equal
probably had different hash codes.

RadioMetadata now instead lazily computes its hash code based upon the keys and
values in mBundle.

Fixes: 130750904
Test: atest com.android.server.broadcastradio.hal2.StartProgramListUpdatesFanoutTest
Change-Id: Ia49716594744871831bc3734aea37e0f505897bf
2019-08-02 11:05:42 -07:00
Yin-Chia Yeh
9543bf36a0 Merge "Camera: fix NPE from bad requestID" 2019-08-01 17:13:28 +00:00
Kevin Chyn
74c58d7ab7 Merge "Do not use canAuthenticate() to check if user can reset lockout" into qt-r1-dev am: 8f0cd6547c am: 68a997fac1
am: 9cd1a2ee14

Change-Id: Idfccf73c4474d1ecf04ff53ed09a2f2894c39241
2019-07-26 18:39:26 -07: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
George Lu
213c9a04c2 Rewire ProgramInfo updates for 1 HAL : N AIDL fanout
This change completes the refactor to enable multi-AIDL client support on the v2
BroadcastRadioService:
- Adds incremental updating to ProgramInfoCache as requested on ag/6922213.
- TunerSession now maintains a ProgramInfoCache as a view of the state
transmitted to the AIDL client.
- RadioModule also has a ProgramInfoCache as a view of the state
received from the HAL.
- The two classes communicate with each other to propagate changes in
filters or ProgramInfos.

This change also makes the following framework changes:
- Overrides ProgramList.Filter#equals() and #hashCode().
- Addresses an oversight from ag/6922213, where RadioMetadata#hashCode() should have been overridden.

Bug: 126887436
Bug: 121305828
Test: atest com.android.server.broadcastradio.hal2.StartProgramListUpdatesFanoutTest atest com.android.server.broadcastradio.hal2.ProgramInfoCacheTest
Change-Id: I03b0b60b30c01ed03d3a86cff105f2efe830b233
2019-07-25 09:28:41 -07:00
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
Yin-Chia Yeh
67bd78ad73 Camera: fix NPE from bad requestID
This avoid NPE exception and accompanying logspam from binder
callbacks.

Test: N/A
Bug: 135268793
Change-Id: I729f4905c94698c95733570abe92ca3ba9163cc5
2019-06-19 14:27:36 -07: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