Commit Graph

3837 Commits

Author SHA1 Message Date
Xin Li
48e70ad8bc DO NOT MERGE - Merge ab/7272582
Bug: 190855093
Merged-In: I81c036a8484d14683db9450b55bd379c7a728d73
Change-Id: I71fe9744d88740a8d95235ddb4c8ab91881473ce
2021-06-14 22:01:46 -07:00
Nathalie Le Clair
1d5d3ca3cf Add lcnathalie to OWNERS
Bug: N/A
Test: N/A
Change-Id: I369963eb006affb24cba0ab9ef97ec797396fc53
2021-05-12 13:47:10 +02:00
Paul Crowley
c36995ec84 Merge changes from topic "biometric-unlocked-required"
* changes:
  Tell keystore which SIDs can unlock this user
  Use UserHandle.myUserId() to look up user
2021-04-28 18:29:31 +00:00
Vladimir Marko
b909b68c3d Biometrics: Add back import needed by lint.
Test: m out/soong/.intermediates/frameworks/base/doc-comment-check-docs/android_common/doc-comment-check-docs-docs.zip
Bug: 163866361
Bug: 186586694
Change-Id: I1e105ef8bae55c6ad01952739c5b092797217766
2021-04-28 09:57:28 +01:00
Paul Crowley
4459123d49 Use UserHandle.myUserId() to look up user
BiometricManager runs in the app, not in system server, so use
the appropriate call to look up the current user.

Test: aosp/1686345
Bug: 163866361
Change-Id: I10c1ddacf14bd6b77ecfc1cb8235c42b8a7fbcfe
2021-04-27 10:34:33 -07:00
[6;7~
6e14fdc46b Specify UID in getAuthenticatorIds
Allow the caller to get authenticator IDs for a specific UID. If
that UID is not the caller UID the USE_BIOMETRIC_INTERNAL permission
is required; this is enforced by AuthService.

Test: aosp/1686345
Bug: 163866361
Merged-In: I0eef28ecefb85f1c10a73a354d08c38087d59814
Change-Id: I0eef28ecefb85f1c10a73a354d08c38087d59814
2021-04-27 10:34:32 -07:00
Kevin Chyn
e68e9ecd54 Update biometric OWNERs to single source of truth
Test: Builds
Change-Id: I21f1f1d61f49d3db93b120fca29893f86526bb9c
2021-04-22 19:31:23 -07:00
Treehugger Robot
6e7f16ac1e Merge "CEC: Drop TODOs marked as fixed/obsolete" 2021-04-19 09:46:37 +00:00
Janis Danisevskis
8c97d4fe79 Fix operation auth bound keys.
CryptoObject still called the legacy AndroidKeystoreProvider which did
not return the correct operation handle for per operation auth bound
keys.

Bug: 184804041
Bug: 185181377
Test: CtsVerifier->Security->Biometric Tests->2a Strong Biometrics +
      Crypto
Merged-In: I0bceff0425e7ef32c394f33deda3c78f729c0c6c
Change-Id: I0bceff0425e7ef32c394f33deda3c78f729c0c6c
2021-04-16 12:55:33 -07:00
Aravind Angadi
9eee708a97 CEC: Drop TODOs marked as fixed/obsolete
Bug: 159901363
Test: None
Change-Id: Ied8bf487857c3fb3f27d92d7dbdd8beeb981442c
2021-04-15 12:52:53 +05:30
Treehugger Robot
7c740535b1 Merge "CEC: Remove the TODO in HdmiPlaybackClient class" am: cc62385767 am: f4e1962df0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1666843

Change-Id: I31b84ab1a150b53bcf4ca0f97f4a1bd3d7d5c4ad
2021-04-07 15:31:13 +00:00
Aravind Angadi
4e891c6e62 CEC: Remove the TODO in HdmiPlaybackClient class
HdmiControlService.oneTouchPlay method is already switching the
long running one touch play process to the service thread from
the UI thread and is also able to handle multiple OTP requests
in parallel. Remove TODO to use PendingResult.

Bug: 159901363
Test: None
Change-Id: Ife8c8268edb8a40255a52dd1eda2ab60020803c8
2021-04-07 12:30:06 +00:00
Jayant Chowdhary
b2f70b04d4 Merge "getCameraIdListNoLazy : remove system cameras from mTorchStatus as well." 2021-04-06 21:24:12 +00:00
Jayant Chowdhary
db762c7e13 getCameraIdListNoLazy : remove system cameras from mTorchStatus as well.
Bug: 182530469

Test: Make Emulator back camera system camera; atest FlashlightTest.java

Merged-In: I0a149ba3d93a740cfbfdc2d04c1235e648061156
Change-Id: I0a149ba3d93a740cfbfdc2d04c1235e648061156
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit bedb9950c8)
2021-04-06 20:13:25 +00:00
Jayant Chowdhary
719a693721 Merge "getCameraIdListNoLazy : remove system cameras from mTorchStatus as well." into rvc-qpr-dev am: 3a6b247ec0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14071306

Change-Id: Ie89d317127ad31866256a290899e91acc730cfc6
2021-04-03 06:30:22 +00:00
Jayant Chowdhary
02622abbe2 getCameraIdListNoLazy : remove system cameras from mTorchStatus as well.
Bug: 182530469

Test: Make Emulator back camera system camera; atest FlashlightTest.java

Merged-In: I0a149ba3d93a740cfbfdc2d04c1235e648061156
Change-Id: I0a149ba3d93a740cfbfdc2d04c1235e648061156
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit bedb9950c8)
2021-04-02 18:55:48 +00:00
Jimmy Chen
4f1799e6c8 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-qpr-dev am: e851fc58d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13824713

Change-Id: I128bd35ad9dea6d9085f746790af2c1bc2344b47
2021-04-01 02:35:18 +00:00
Jimmy Chen
e851fc58d6 Merge "wifidisplay: restrict broadcast by the proper permission" into rvc-qpr-dev 2021-04-01 01:42:28 +00:00
Shuzhen Wang
640011569f Camera: Fix a removal-while-iterate bug
The onStatusChangedLocked removes entries from the ArrayMap. Needs to
iterate in the reverse order.

Test: Vendor testing
Bug: 182876702
Change-Id: I5891f24a25c83f096d23ca5675126889a7d2a61c
2021-03-30 14:42:33 -07:00
Shuzhen Wang
7b8379f55d Merge "Camera: Fix a removal-while-iterate bug" am: 171249e857 am: f1f504042a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643703

Change-Id: Ib5a8d564723118065ef7a2b9e971f588f086ea2f
2021-03-19 19:35:38 +00:00
Shuzhen Wang
3759c1623d Camera: Fix a removal-while-iterate bug
The onStatusChangedLocked removes entries from the ArrayMap. Needs to
iterate in the reverse order.

Test: Vendor testing
Bug: 182876702
Change-Id: I5891f24a25c83f096d23ca5675126889a7d2a61c
2021-03-17 16:56:43 -07:00
Jimmy Chen
fd8b6dabf9 wifidisplay: restrict broadcast by the proper permission
WIFI_DISPLAY_STATUS_CHANGED event contains the MAC address of peers.
As the MAC address is PII data, this should be restricted by proper
permission.

Bug: 176541017
Test: install PoC in b/176541017 and check PII data is not leaked.
Change-Id: I36b85f44678fe232486702fa009f5f06d1a7af75
2021-03-11 12:07:31 +08:00
Xin Li
4bbe2a2df3 Merge RQ2A.210305.007 into stage.
Bug: 180401296
Merged-In: I1a16808426934f4a8d12410576d769443e4c2a04
Change-Id: I247a99c33c62cd1d000b7e50d1dda8b14df229d7
2021-03-01 01:06:43 -08: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
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
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
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
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
Michael Wright
471c70287e Merge "Consolidate OWNERS for input" 2021-02-23 00:11:44 +00: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
Xin Li
be473bf819 Merge ab/7061308 into stage.
Bug: 180401296
Merged-In: I4bf82035631ccff6d5a6144d6d9b1d203b076851
Change-Id: I1b5f3a672a55eaabba0f5389bab110b395553559
2021-02-21 09:39:53 -08:00
Anthony Stange
5927064796 Merge "Add owners for files related to the sensors framework" 2021-02-19 17:23:45 +00:00
Anthony Stange
8b97ec7957 Add owners for contexthub framework code
Bug: 166846988
Change-Id: Id2b82d4df8083d4b70be2e27d31e32ead7ce7c75
Test: presubmits
2021-02-12 17:43:07 +00:00
Anthony Stange
101500307f Add owners for files related to the sensors framework
Bug: 136069189
Change-Id: I61b5e77c5bf07b22be725714f743f8ef84a96482
Test: presubmits
2021-02-12 17:27:21 +00:00
Philip P. Moltmann
a8eb3d3e69 Remove me from OWNERS files
Test: n/a
Change-Id: I6113011e6ab0997285d5b7a86303fc60a3b98a2b
Exempt-From-Owner-Approval: Previously approved
2021-02-11 22:28:43 +00:00
Lorenzo Colitti
79c9c9e365 Allow RNDIS and NCM to be enabled at the same time.
Currently, UsbManager#setCurrentFunctions takes a bitmask of
functions to enable, but will only allow callers to enable one
function at a time.

Allow it to enable both RNDIS and NCM together as well. This is
because from the user's point of view the two functions are the
same (i.e., USB tethering).

Android has historically used RNDIS for tethering. NCM performs
better, but it doesn't work on older OSes like Windows 8.1.

Also change the import order to keep the linter happy.

Bug: 172793258
Test: added unit test for UsbManager.areSettableFunctions
Change-Id: I51b6752781528b09f8929e1fb3b1fa7e4ac36aae
2021-01-23 11:30:29 +00:00
Michael Wright
58515946ac DO NOT MERGE "Allow DeviceConfig to change display settings for high zone"
Allow DeviceConfig to change the high zone behavior including
refresh rate and brightness thresholds.

Bug: 177636374

Test: atest DisplayModeDirectorTest
Test: adb shell device_config put display_manager refresh_rate_in_high_zone "90"
Test: adb shell device_config put display_manager fixed_refresh_rate_high_display_brightness_thresholds "200"
Test: adb shell device_config put display_manager fixed_refresh_rate_high_ambient_brightness_thresholds "8000"
Change-Id: I1463d6c5daaee46a87a193e98e7f63cad9274b49
2021-01-19 01:07:01 +00:00
raylinhsu
364ecec077 DO NOT MERGE Revert "Allow DeviceConfig to change display settings for high zone"
This reverts commit cf55c21064.

Bug: 176018998
Test: atest DisplayModeDirectorTest
Change-Id: Ib576e16257d7903b39efa8015c2af3be8c0d0c40
(cherry picked from commit b14bed88c5)
2021-01-14 23:02:44 +00:00
raylinhsu
b14bed88c5 DO NOT MERGE Revert "Allow DeviceConfig to change display settings for high zone"
This reverts commit cf55c21064.

Bug: 176018998
Test: atest DisplayModeDirectorTest
Change-Id: Ib576e16257d7903b39efa8015c2af3be8c0d0c40
2021-01-13 14:04:08 +08:00
Kevin Chyn
835f50b21a Add additional biometrics OWNERS
Test: Builds
Change-Id: Ief8ea06dcc5803298294c639956cdfa97fa8be10
2021-01-11 13:43:29 -08:00
Kevin Chyn
8777a4dda3 Add team members to biometric OWNERS
Test: Presubmit
Change-Id: I0b503756a60fc8dcaaf8bcd1f1fa13628b2b9b75
2021-01-07 17:56:19 -08:00
Nicolas Geoffray
e6db6b21e6 Merge "Remove FastNative annotations on synchronized methods." 2020-12-14 13:41:06 +00:00
Nicolas Geoffray
498aa12949 Remove FastNative annotations on synchronized methods.
FastNative doesn't work on synchronized methods.

Bug: 175016705
Test: 004-JniTest
Change-Id: I1e34c78a8438c67e5a1bedb83eb977389ee9a82d
Merged-In: I1e34c78a8438c67e5a1bedb83eb977389ee9a82d
(cherry picked from commit 7c4c101a7b)
2020-12-13 17:44:59 +00:00
Nicolas Geoffray
0874a6fb49 Remove FastNative annotations on synchronized methods.
FastNative doesn't work on synchronized methods.

Bug: 175016705
Test: 004-JniTest
Change-Id: I1e34c78a8438c67e5a1bedb83eb977389ee9a82d
Merged-In: I1e34c78a8438c67e5a1bedb83eb977389ee9a82d
(cherry picked from commit 7c4c101a7b)
2020-12-11 09:11:44 +00:00
Michael Groover
272b06dce4 Merge "Add OWNERS for sensor privacy" am: 05c699d02e am: f2c250acb9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520165

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c6999ee0d59f4424cced74423c174bcfcdeeaa3
2020-12-10 19:48:56 +00:00
Michael Groover
05c699d02e Merge "Add OWNERS for sensor privacy" 2020-12-10 19:24:46 +00:00
Treehugger Robot
d489358491 Merge "HDMICEC: Change hashcode for HdmiPortInfo" am: d8cd3c7d2d am: 8f4bb0a2a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1483970

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If924ee797a4d75c93840ea2947d754de30a9f58a
2020-12-10 16:33:04 +00:00
Treehugger Robot
d8cd3c7d2d Merge "HDMICEC: Change hashcode for HdmiPortInfo" 2020-12-10 15:59:53 +00:00
Jeff Sharkey
577ee1b6d5 Merge "Add OWNERS to HDMI control directories" am: fd2f7c893a am: b76f77b9b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519668

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02dfb322253ba59376fe0f63feae055f01eabe3f
2020-12-09 18:48:31 +00:00