Treehugger Robot
2b65793cd6
Merge "Merge Android10 QPR1 into AOSP master"
2019-12-03 23:15:02 +00:00
Emilian Peev
6f3e5a0d49
Camera: Avoid removing valid repeating requests
...
Due to lock contention between the legacy camera
device implementation and the Camera2 framework,
result and error callbacks can be delayed which
can allow clients to update the repeating request
resulting in incorrect behavior.
To avoid this, check whether repeating request
errors still refer to valid and active request ids
tracked by the request queue before posting
callbacks.
Bug: 143727669
Test: Camera CTS
Change-Id: I8f2da0aace40b33757b3c3ac4febc3af7f0ec6cd
2019-11-04 14:24:30 -08:00
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
567cb2b5cc
Merge changes If9068025,I728e5bf9,I9d41169d am: 3b6a00ec3c am: 225b9d90c2
...
am: 3aadf0a4d9
2019-10-02 15:21:10 -07:00
Dmitry Shmidt
3aadf0a4d9
Merge changes If9068025,I728e5bf9,I9d41169d am: 3b6a00ec3c
...
am: 225b9d90c2
2019-10-02 14:27:56 -07:00
Dmitry Shmidt
225b9d90c2
Merge changes If9068025,I728e5bf9,I9d41169d
...
am: 3b6a00ec3c
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
Yin-Chia Yeh
4a75a20232
Merge "Camera: fix NPE from bad requestID" into qt-qpr1-dev
...
am: 51cf32b4f3
2019-09-18 14:00:20 -07:00
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
e0630bca2d
Merge "Camera: fix NPE in buffer error callback" into qt-qpr1-dev
...
am: d0a1ab93d4
2019-09-14 01:07:08 -07:00
Madhava Srinivasan
54a545f1e3
Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService" am: 4efb0c510d am: a40f432ac6
...
am: 0e7175db88
2019-09-13 10:51:01 -07:00
Madhava Srinivasan
0e7175db88
Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService" am: 4efb0c510d
...
am: a40f432ac6
2019-09-13 10:38:05 -07:00
Madhava Srinivasan
a40f432ac6
Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService"
...
am: 4efb0c510d
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
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
a1b4326b06
[DO NOT MERGE] Move device config high_refresh_rate_blacklist to display_manager
...
am: 5a570b3898
2019-09-04 12:27:02 -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
2019-09-03 14:41:16 -07:00
Long Ling
f024c2ed38
Merge "DMD: Support 90hz only in the refresh rate zone" into qt-r1-dev am: d44f2edc08
...
am: 1f4f57eab4
2019-09-03 14:41:12 -07:00
Long Ling
1f4f57eab4
Merge "DMD: Support 90hz only in the refresh rate zone" into qt-r1-dev
...
am: d44f2edc08
2019-08-30 16:50:42 -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
Aurimas Liutikas
488d37b2d0
Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be am: ed5beec21b
...
am: de0ebb082e
2019-08-30 08:54:38 -07:00
Aurimas Liutikas
de0ebb082e
Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be
...
am: ed5beec21b
2019-08-30 08:43:01 -07:00
Aurimas Liutikas
ed5beec21b
Merge "Add missing nullability annotations." into stage-aosp-master
...
am: 85c0a5a2be
2019-08-30 08:35:52 -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
7227ff19aa
DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager
...
am: dde6248065
2019-08-23 06:24:30 -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
999a704b02
DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager
...
am: 6f13f12213
2019-08-21 12:55:19 -07:00
Tomasz Wasilczyk
83f996382d
Merge "Move processing off of HIDL Binder" into qt-qpr1-dev
...
am: ab45e744e6
2019-08-21 12:47:23 -07: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
b7fa2d8192
Merge "docs: Correct sensor runtime permission documentation" into qt-dev am: 119f1220cd am: 7eeb6f60f9
...
am: 6b15b773a3
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
2019-08-14 13:23:37 -07:00
Brian Duddie
e1d3f8e84a
Merge "docs: Correct sensor runtime permission documentation" into qt-dev am: 119f1220cd
...
am: 7eeb6f60f9
2019-08-14 13:19:42 -07:00
Brian Duddie
6710441150
Merge "docs: Correct sensor runtime permission documentation" into qt-dev
...
am: 119f1220cd
2019-08-14 13:10:45 -07:00
Brian Duddie
7eeb6f60f9
Merge "docs: Correct sensor runtime permission documentation" into qt-dev
...
am: 119f1220cd
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
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
Yin-Chia Yeh
8251b2deea
Camera: fix getKeys impl for vendor keys
...
am: 1b1f14ebff
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
Kevin Chyn
68a997fac1
Merge "Do not use canAuthenticate() to check if user can reset lockout" into qt-r1-dev
...
am: 8f0cd6547c
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
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
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
2019-06-28 18:22:20 -07:00
