Commit Graph

4344 Commits

Author SHA1 Message Date
Vladimir Marko
cce3bb5244 resolve merge conflicts of 6f0d5e0d1b to sc-dev
Test: N/A
Bug: None
Change-Id: I88560c8b73cff8b5dab5f0d53af026651e8952d0
2021-02-26 17:04:21 +00:00
Curtis Belmonte
b7bc5bce77 Tweak strings for traffic light face enrollment
Makes the following changes to help messages that will be shown during
traffic light face enrollment:
- Swaps messages for FACE_ACQUIRED_TOO_HIGH and FACE_ACQUIRED_TOO_LOW.
- Changes FACE_ACQUIRED_TILT_TOO_EXTREME message from "turn" to "tilt".

Test: Manually tested traffic light enrollment.

Bug: 179044580
Change-Id: I729cc1ac1909f3181b88d869358a4e9deb6761fd
2021-02-25 17:21:11 -08:00
Evan Severson
445abca30e Merge "Expose SensorPrivacy as SystemApi" into sc-dev 2021-02-25 18:29:43 +00:00
Ytai Ben-tsvi
6f0d5e0d1b Merge "Add ytai@ as OWNER of soundtrigger-related dirs" am: 29cfbb1a50 am: a2c4396579
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1603659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb454376c644ffe0f1bf6c53a74d1c08c56f6ea7
2021-02-25 00:10:29 +00:00
Evan Severson
0f9d5aea50 Expose SensorPrivacy as SystemApi
Rename the apis to be more consistent.
Also expose to test api.
Have the aosp mark that it supports the toggle features by default.

Test: atest CtsSensorPrivacyTestCases
Bug: 162549680

Change-Id: Ib38c16adfc5cec931347e1a1891618983d78248b
2021-02-24 15:39:19 -08:00
Curtis Belmonte
075cee61d4 Merge "Fix string for face auth positional help messages" into sc-dev 2021-02-24 23:11:46 +00:00
Ytai Ben-tsvi
a2c4396579 Merge "Add ytai@ as OWNER of soundtrigger-related dirs" am: 29cfbb1a50
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1603659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I611305c07c10336ac15a6c0cf1e13733fc9134f4
2021-02-24 22:58:32 +00:00
Ytai Ben-Tsvi
233f1a159b Add ytai@ as OWNER of soundtrigger-related dirs
Change-Id: Ie1ab78515c6f1c7cb444752a0623cb6f701d0410
2021-02-24 09:50:21 -08:00
Anton Hansson
eaeaf0acac Merge "Revert "Adding public API to expose DisplayInfo.deviceProductInfo"" into sc-dev 2021-02-24 12:27:18 +00:00
TreeHugger Robot
e40cc0a9d2 Merge "Fix possible NPE when matching accessory version" into rvc-qpr-dev am: 01f8961bce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13671451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5379f67519077a60ac692babb18ba74a6ab23cb6
2021-02-24 08:15:20 +00:00
Kevin Chyn
eef75a4842 Merge "Add re-enrollment notification for face AIDL" into sc-dev 2021-02-24 03:17:15 +00:00
Michael Wright
69a0c089e9 Merge "Consolidate OWNERS for input" am: 471c70287e am: 916d84985b am: 863092a877
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1600293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83f41b7b86208b6ada82728c08043e76f57ac44a
2021-02-24 00:23:09 +00:00
Kevin Chyn
7b6dd6a64c Add re-enrollment notification for face AIDL
1) Move re-enrollment logic to its own class
2) Show / clear the notification when appropriate for face AIDL

Fixes: 180652977
Test: manual
Change-Id: I85b386be132974cda6e6e973b244f3cb8300c291
2021-02-23 16:12:27 -08:00
Michael Wright
916d84985b Merge "Consolidate OWNERS for input" am: 471c70287e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1600293

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I365e6075c104f327331e08fc642c74d0050c21b5
2021-02-24 00:10:55 +00:00
TreeHugger Robot
360c3626e9 Merge "Camera2: Add jpeg encoding support for all camera extensions" into sc-dev 2021-02-23 21:48:35 +00:00
Curtis Belmonte
1674d0da7d Fix string for face auth positional help messages
Test: Manual

Bug: 179044580
Change-Id: If4bcc6c1feafb7af385344108fe977ed35d10d2b
2021-02-23 13:41:27 -08:00
Ulyana Trafimovich
d6bff72799 Revert "Adding public API to expose DisplayInfo.deviceProductInfo"
Revert "Adding aidl file to share deviceProductInfo constants bw..."

Revert "Changes in tvsystem/ DeviceProductInfo to mirror changes..."

Revert "Adding new CTS test for the API display#getDeviceProductInfo"

Revert submission 13552775-expose DisplayInfo.deviceProductInfo

Reason for revert: broken test android.compat.sjp.cts.StrictJavaPackagesTest#testBootClassPathAndSystemServerClasspath_nonDuplicateClasses
    on git_sc-dev on cf_x86_64_phone-userdebug at 7162420

Bug: 181021245

Reverted Changes:
Id6767127f:Adding aidl file to share deviceProductInfo consta...
I6959d2829:Adding public API to expose DisplayInfo.deviceProd...
I720dbfe84:Adding new CTS test for the API display#getDeviceP...
I6c726e12c:Changes in tvsystem/ DeviceProductInfo to mirror c...

Change-Id: I4c8545c651d1e399ed3ca5061d1ef5f526c3929a
2021-02-23 17:14:58 +00:00
Sean Stout
303e58eebf Merge "Request power state updates for individual DisplayGroups" into sc-dev 2021-02-23 11:21:15 +00:00
Daniel Peykov
41802905f9 Fix possible NPE when matching accessory version
As UsbAccessory#getVersion is nullable, a NPE can occur if the manufacturer/model match.

Bug: 172002066
Bug: 178227159
Bug: 180055624
Change-Id: I751a01e3d182e01e5a9dbc011b60535997f9bc15
(cherry picked from commit 25dca30e2f)
2021-02-23 09:11:52 +00:00
Chris Ye
98580a2e82 Merge changes from topic "LightsManager" into sc-dev
* changes:
  Support input device lights manager feature in frameworks.
  Add SET_REPORT data output to hid commandline tool.
2021-02-23 08:19:13 +00:00
Sean Stout
0e9bb71eda Request power state updates for individual DisplayGroups
Update PowerManagerService to track and update the power state of
DisplayGroups individually.

This allows for different Displays to be on or off instead of needing to
all share the same power state.

Bug: 138328918
Test: atest FrameworksServicesTests:PowerManagerServiceTest
Change-Id: Ia32039415863ba745c7de2fba55bf25e68de4d15
2021-02-22 23:18:42 -08:00
Michael Wright
471c70287e Merge "Consolidate OWNERS for input" 2021-02-23 00:11:44 +00:00
Chris Ye
cbb480c25e Support input device lights manager feature in frameworks.
Add lights manager support to input frameworks.

Bug: 161633625
Test: atest LightsManagerTest, atest InputDeviceLightsManagerTest
Change-Id: Ic6c701cad84f277325583c77195592d96d9296b8
2021-02-22 16:06:35 -08:00
Michael Wright
bea28e9f39 Consolidate OWNERS for input
Bug: N/A
Test: N/A
Change-Id: Ib1b3172575b50fbd3869e173d3a751864600173a
2021-02-22 23:30:08 +00:00
TreeHugger Robot
4226338442 Merge "Plumb attribution tag from Sensor Manager" into sc-dev 2021-02-22 18:20:36 +00:00
Kriti Dang
bcd8ea64de Merge "Adding public API to expose DisplayInfo.deviceProductInfo" into sc-dev 2021-02-22 13:31:42 +00:00
Xin Li
be473bf819 Merge ab/7061308 into stage.
Bug: 180401296
Merged-In: I4bf82035631ccff6d5a6144d6d9b1d203b076851
Change-Id: I1b5f3a672a55eaabba0f5389bab110b395553559
2021-02-21 09:39:53 -08:00
Kevin Chyn
0d1b06e3d5 Revert^2 "Try to ensure tests run sequentially"
c0dd229fc6

Change-Id: I1d9366f0cbe4fb41cedfed987162ec15e7845530
2021-02-19 13:45:45 -08:00
Kevin Chyn
bd18a4681d Fix NPE during fingerprint removal
1) Enroll fingerprint
2) Remove lockscreen credential
3) All fingerprints removed successfully

Bug: 180689674
Test: See steps above
Change-Id: I8ae947114ec1cc90738152ec33c13cc62c302559
2021-02-19 13:45:44 -08:00
Kevin Chyn
e0552feba5 Revert^2 "Update RemovalClient to support new biometric AIDL"
62e2c705c5

Change-Id: If7af8a38f114804fc48feba9744bd9ba936c865e
2021-02-19 13:19:54 -08:00
TreeHugger Robot
4d4817a9b3 Merge changes from topic "revert-13593269-QAPPBSWOVZ" into sc-dev
* changes:
  Revert "Update RemovalClient to support new biometric AIDL"
  Revert "Try to ensure tests run sequentially"
2021-02-19 21:07:47 +00:00
Anthony Stange
e9681f3bbb Merge "Add owners for files related to the sensors framework" am: 5927064796 am: 16d6248bc6 am: a04505c12e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3220b76d3417cee41a6a63ffc86082a8638142b6
2021-02-19 19:19:47 +00:00
Daniel Chapin
62e2c705c5 Revert "Update RemovalClient to support new biometric AIDL"
Revert submission 13593269

Reason for revert: Bug: 180689674
Reverted Changes:
I59f6e607f:Update RemovalClient to support new biometric AIDL...
I3fdb3fe0b:Try to ensure tests run sequentially

Change-Id: I939172f2961f3f2c9f8eddd59261f75552eeb31f
2021-02-19 19:10:04 +00:00
Daniel Chapin
c0dd229fc6 Revert "Try to ensure tests run sequentially"
Revert submission 13593269

Reason for revert: Bug: 180689674
Reverted Changes:
I59f6e607f:Update RemovalClient to support new biometric AIDL...
I3fdb3fe0b:Try to ensure tests run sequentially

Change-Id: Ia9c02759db7238536e21dd05f8e247a91e9ac5aa
2021-02-19 19:10:04 +00:00
Anthony Stange
a04505c12e Merge "Add owners for files related to the sensors framework" am: 5927064796 am: 16d6248bc6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24ab3a9bc3556fbdfe97287508dc4f539fa071f4
2021-02-19 18:58:31 +00:00
Arthur Ishiguro
a9920b8e8d Plumb attribution tag from Sensor Manager
Bug: 171922082
Test: Compile
Change-Id: I50a9ea96a9cfb17634942939f95b7a45b4d6f426
2021-02-19 18:24:56 +00:00
Anthony Stange
5927064796 Merge "Add owners for files related to the sensors framework" 2021-02-19 17:23:45 +00:00
Kriti Dang
0a40860bc1 Adding public API to expose DisplayInfo.deviceProductInfo
Changing class DeviceProductInfo to public class with hidden ctor to expose via
Display#getDeviceProductInfo. Removing the relative address and changing
to connectionToSinkType.

Bug: 179775994
Test: atest CtsDisplayTestCases
Change-Id: I6959d2829f7ff9ba609f9e4e3cb7b52e0f555c3f
2021-02-19 15:14:41 +01:00
Emilian Peev
ab80824153 Camera2: Add jpeg encoding support for all camera extensions
Enable consistent Jpeg output support for all present camera
extensions. Extensions with exclusive YUV_420 support will
include an extra SW encoding pass before the processed results
can be queued back to the client surface.

Bug: 179818844
Test: Camera CTS

Change-Id: I461e54024f150925ca1a5a57ff7b327712ce0e96
2021-02-17 17:37:44 -08:00
Yin-Chia Yeh
73ef4bcca6 Merge "Camera: add default secure image size key" into sc-dev 2021-02-18 00:15:09 +00:00
Kevin Chyn
fe62a99c63 Merge changes I3fdb3fe0,I59f6e607 into sc-dev
* changes:
  Try to ensure tests run sequentially
  Update RemovalClient to support new biometric AIDL
2021-02-17 23:36:03 +00:00
Kevin Chyn
e5ffb5805e Merge "Retrieve authenticatorId when already targetUserId" into sc-dev 2021-02-17 22:17:07 +00:00
Kevin Chyn
e43e5b1337 Retrieve authenticatorId when already targetUserId
Previous change ag/13413165 stopped the framework from retrieving
authenticatorId when the current user is already the target user.
However, this happens immediately after enrollment, since enroll
and getAuthenticatorId are separate operations. So, add a way to
retrieve authenticatorId only when necessary.

Fixes: 179737483
Bug: 178018968
Test: manual
Change-Id: I71673fc672c60733616634a2fdf3153a3b2d02e1
2021-02-17 12:29:11 -08:00
TreeHugger Robot
d271b73c5e Merge "Enforce nanoapp permissions for ContextHub APIs" into sc-dev 2021-02-17 19:13:13 +00:00
Anthony Stange
ab42e66b4c Enforce nanoapp permissions for ContextHub APIs
Adds the following behavior:
1) Ensures nanoapp messages aren't delivered to host apps unless they
hold the required permissions
2) Ensures that host apps continue to hold the required permissions set

Also pipes the package name for callback clients since their package
name can't be determined on the other side of the binder.

Bug: 166846988
Test: Disable permissions on host client and verify that nanoapp and
host lose communication after ~1 minute
Test: Re-enable permissions on host client and verify host receives
appropriate callback

Change-Id: I14af504f0b230f6ce15852f16fc8b174fdd52252
2021-02-17 16:53:37 +00:00
Anh Pham
857efd19a4 Merge changes from topic "sensor_sampling_rate_throttling-sc-dev" into sc-dev
* changes:
  Throw SecurityException regarding sampling rates.
  Add support for retrieving the Debuggable flag.
  Add HIGH_SAMPLING_RATE_SENSORS permission.
2021-02-17 07:44:54 +00:00
Kevin Chyn
d6d23e13a5 Try to ensure tests run sequentially
Asynchronous operations that are performed in close() (such as
cleanupInternalState()) should complete before close() finishes.
Otherwise, we risk subsequent tests starting and causing racey
conditions while cleanup has not finished yet.

Fixes: 180192766
Test: atest CtsBiometricsTestCases
Test: atest com.android.server.biometrics
Change-Id: I3fdb3fe0be59e826d0c14e14a2590ccdde568774
2021-02-16 21:34:34 -08:00
Kevin Chyn
b2888343b7 Update RemovalClient to support new biometric AIDL
The new AIDL interfaces accept a list of IDs to remove. Note that
the new interfaces explicitly do NOT support using "remove(0)"
to remove all enrollments.

Fixes: 179338634
Test: atest CtsBiometricsTestCases
Test: atest com.android.server.biometrics
Change-Id: I59f6e607ff876541f049ac70d06046815eba7632
2021-02-16 21:34:34 -08:00
Alex Johnston
202d4ab178 Merge "Support USB V1.3 HAL" into sc-dev 2021-02-16 20:45:55 +00:00
Anthony Stange
30780cf472 Merge "Add new ContextHubTransaction error code" into sc-dev 2021-02-16 20:41:55 +00:00