Commit Graph

3247 Commits

Author SHA1 Message Date
David Zeuthen
70485380f7 Merge "Add Framework APIs for Identity Credential."
am: 2fb5112a35

Change-Id: Ifb511b43fd180980badef43b7ea3009e3a9ba00b
2020-01-21 06:45:12 -08:00
David Zeuthen
045b6de975 Add Framework APIs for Identity Credential.
The Identity Credential APIs provides an interface to a secure store
for user identity documents.  These APIs are deliberately fairly
general and abstract.  To the extent possible, specification of the
message formats and semantics of communication with credential
verification devices and Issuing Authorities (IAs) is out of scope for
these APIs.

The Identity Credential APIs rely on user authentication to protect
data elements in credentials which is implemented through
auth-tokens. This CL contains changes to CryptoObject to allow this.

Bug: 111446262
Test: CtsIdentityTestCases
Change-Id: I48f21a561b762d86c9ca8d229962782572412f47
2020-01-20 15:56:57 -05:00
Automerger Merge Worker
658a0373a2 Merge "USB: [Tethering mainline] Expose @hide APIs to @SystemApi" am: d997a3571b am: 62a34ebc11
Change-Id: I9578c3d1b30c1c747b88a146a691f3280f448039
2020-01-09 04:33:30 +00:00
James Wei
7d66bd9b54 USB: [Tethering mainline] Expose @hide APIs to @SystemApi
Bug: 142372304
Test: Manual test: Enable USB tethering
Test: atest UsbTests
Test: atest UsbManagerTests
Change-Id: Ib284b0a72b06ff45b4d3b55a8d48c20f51284a20
2020-01-09 10:21:34 +08:00
Automerger Merge Worker
59d58f5cae Merge "Use new UnsupportedAppUsage annotation." am: 9395887931 am: 8081ee1b35
Change-Id: I330594303664e66571a460fdb1a5ab6cb8e5e273
2020-01-08 17:14:42 +00:00
Artur Satayev
33f9217695 Use new UnsupportedAppUsage annotation.
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library.

Bug: 145132366
Test: m && diff unsupportedappusage_index.csv
Change-Id: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
Merged-In: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
2020-01-08 14:04:40 +00:00
Automerger Merge Worker
162fb37428 Merge "Camera: Fix typo when comparing display size height" into qt-qpr1-dev am: 870f67cc63
Change-Id: I74bd4ba4084d10f5e8ea866cc06799c52372e10e
2019-12-26 17:33:22 +00:00
Emilian Peev
e6818d5f6c Camera: Fix typo when comparing display size height
Call "getHeight()" instead of "getWidth()" when
comparing against preview size height.

Bug: 146364316
Test: Camera CTS
Change-Id: I588fd3b331380ff20762c24762e997d4a878cc44
Merged-In: I588fd3b331380ff20762c24762e997d4a878cc44
(cherry picked from commit 8649a91686)
2019-12-17 22:59:38 +00:00
Treehugger Robot
2b65793cd6 Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:15:02 +00:00
Emilian Peev
a491caf3fb Merge "Camera: Avoid removing valid repeating requests"
am: 0e7782c87b

Change-Id: Iee1a2277935c0b8a5f04ef9cd85ce7cfbd3415c9
2019-12-03 11:46:08 -08: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

Change-Id: I739f574365d36af6b37d47f5593b9ca14f26ef47
2019-10-02 15:21:10 -07:00
Dmitry Shmidt
3aadf0a4d9 Merge changes If9068025,I728e5bf9,I9d41169d am: 3b6a00ec3c
am: 225b9d90c2

Change-Id: Ia3cc9fbaf08da8dd6823621366d307c40ba209d5
2019-10-02 14:27:56 -07: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
Yin-Chia Yeh
4a75a20232 Merge "Camera: fix NPE from bad requestID" into qt-qpr1-dev
am: 51cf32b4f3

Change-Id: If618d57c6444c874d1d6037c332cbae4c3cf01a6
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

Change-Id: I6b2835b1073df0aeb69e28a1c3aa571caa32b149
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

Change-Id: I3f7c5ec073e82dd323e655bc886a6958a6db0f61
2019-09-13 10:51:01 -07:00
Madhava Srinivasan
0e7175db88 Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService" am: 4efb0c510d
am: a40f432ac6

Change-Id: Ia4c92888f5ddc2e01a8b9025bdec0b00afb8c539
2019-09-13 10:38:05 -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
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

Change-Id: I4cc0818ab0f09efb027455a03506fff90ed46de3
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

Change-Id: Id684830b35b90017be0d5e9fb7c3fe348ffc200f
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

Change-Id: I7324013fadecc41a956a0b6f109b8aee9dd3a374
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

Change-Id: Iaa8a5aca0e16a97a1cd1de529f35a8eeb971cf8d
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

Change-Id: I60c55b6706e8d43121e8b2c7a35efff38668f66b
2019-08-30 08:54:38 -07:00
Aurimas Liutikas
de0ebb082e Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be
am: ed5beec21b

Change-Id: I202951d51820be47b9195734601830553215bdd7
2019-08-30 08:43:01 -07:00
Aurimas Liutikas
ed5beec21b Merge "Add missing nullability annotations." into stage-aosp-master
am: 85c0a5a2be

Change-Id: Ic9ea2b9840fbb678bbb6ab77038415581feba918
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

Change-Id: Ic452fed2390fab0f69799a192ce86402b4c0cb7e
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

Change-Id: I299e0eecf9d52e12ecf71b1f1b566637f4479e02
2019-08-21 12:55:19 -07:00
Tomasz Wasilczyk
83f996382d Merge "Move processing off of HIDL Binder" into qt-qpr1-dev
am: ab45e744e6

Change-Id: Id4e5a11a608d797689af90be53f0f0571615333d
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

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
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
6710441150 Merge "docs: Correct sensor runtime permission documentation" into qt-dev
am: 119f1220cd

Change-Id: I61b2d34460edc3986455ef2307f47a431aa751ed
2019-08-14 13:10:45 -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