Commit Graph

813479 Commits

Author SHA1 Message Date
Treehugger Robot
538cb6588f Merge "Keystore: Attestation fix in non AOSP builds" 2023-02-06 19:38:22 +00:00
Dmitri Plotnikov
5623990f16 Merge "battery LED: nearly full level is now configurable" am: 4f2e53f912
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2238876

Change-Id: Ib7ff823f6544992150779a6f4845fbfbb24e67f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 19:12:35 +00:00
Treehugger Robot
7b5b7678a0 Merge "Revert "Revert "Get PackageManager from Context""" am: 1d23fc8283
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2419797

Change-Id: I4ca4b1db9d4bbadf8f1ab0d3cc19cf3e1d85a709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 19:10:11 +00:00
Yixiao Luo
195a80f94a Merge changes from topic "CAS AIDL Integration" am: 9346b8b934
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2418321

Change-Id: Ic496829745dbdd1f7103b0a558df4692dc08c353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 19:07:22 +00:00
Venkatarama Avadhani
4e21cc8205 CAS: Add openSessionDefault am: 46720e796c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2418320

Change-Id: I0627dbe8f94d04a8ecccd2f1e25da9d7fd52943e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 19:06:48 +00:00
Venkatarama Avadhani
74e8d50c98 CAS: Disable Descrambler API for AIDL am: 248dd8cce8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2418319

Change-Id: I6e36999df2addcb1966fe61f12e5226b404fe6e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 19:06:16 +00:00
Dmitri Plotnikov
4f2e53f912 Merge "battery LED: nearly full level is now configurable" 2023-02-06 19:04:13 +00:00
Roshan Pius
78c10de4f5 nfc(frameworks): Consolidate NFC/SE owners file
Bug: N/A
Test: N/A
Change-Id: I1f1957c6fb2ddca4b7b132e02882e82ed2bfe656
2023-02-06 11:01:41 -08:00
Treehugger Robot
1d23fc8283 Merge "Revert "Revert "Get PackageManager from Context""" 2023-02-06 18:37:02 +00:00
Yixiao Luo
9346b8b934 Merge changes from topic "CAS AIDL Integration"
* changes:
  CAS: Fix integration issues with AIDL
  CAS: Add openSessionDefault
  CAS: Disable Descrambler API for AIDL
2023-02-06 18:36:22 +00:00
Tyler Gunn
2517d03c19 Clarify start/stop DTMF tone API documentation.
The API docs are not clear; they insinuate that a caller can issue any
number of "play" DTMF requests followed by a single "stop" request and
that the framework will interpret this as two digits in succession.
In reality, the documentation is referring to the fact that the local tone
will correctly stop if another tone is already playing.  The API
requests are sent directly to the modem as the InCallService sends them,
and it is possible that some ConnectionService implementations (more
specifically some vendor IMS implementations) will get confused if
they receiver multiple starts and then a single stop.

Test: Docs only change
Bug: 262699364
Change-Id: I770008cc3b000f739d930ea899df5e98d1b17129
2023-02-06 18:13:03 +00:00
Himanshu Gupta
b887d19038 Fix getStorageVolumes to return public volumes visible to
userIdSharingMedia with.

In ag/16708639, getStorageVolumes was modified to return volumes
mounted on the calling user.
Clone profile is an exception to this rule, as by definition, it
should access the public volumes available to its parent user.
To fix this we allow a volume to be returned if:
1. Its a public volume and
2. Its visible to the userId the calling user shares media with.

Bug: b/265772860 b/265724297 b/260950918
Test: atest AppCloningHostTest
Change-Id: I84a57ea13b08a5f1cd0095e944aeacc3434df4de
2023-02-06 15:37:23 +00:00
Prashant Patil
d7e1bc711f Keystore: Attestation fix in non AOSP builds
After adding attestation properties for AOSP/GSI builds their comparison
in Spi layer missed one condition. If these values were not set they were assigned
as Build.UNKNOWN. Hence additional check is added in Spi layer.

Bug: 267643193
Test: atest CtsKeystoreTestCases:android.keystore.cts.KeyAttestationTest CtsKeystoreTestCases:DeviceOwnerKeyManagementTest
Change-Id: I5b3ef0a308bbb12bc4cac2efcf04468f65db1ef8
2023-02-06 15:35:49 +00:00
Treehugger Robot
53e05b6b3f Merge "Fix TV doesn't send <Active Source> on boot up" am: 826dbaf5c0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2353103

Change-Id: I0d78af0585e53b5de057b21d879a2e40b5f5a7f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 14:50:56 +00:00
Treehugger Robot
826dbaf5c0 Merge "Fix TV doesn't send <Active Source> on boot up" 2023-02-06 14:26:12 +00:00
Hari Raj Vijayakumar
0d11f067c1 Remove WRITE_SETTINGS permission check from AudioManager getter APIs
Bug: 267725330
Test: manual
Change-Id: Ib3255900c816591ab15e23919ad0541c34563e63
2023-02-06 18:34:34 +05:30
Nathalie Le Clair
41dba62f7c Merge "HDMICEC: Call setArcStatus in setArcMode" am: 7b4e6dc561
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572281

Change-Id: I07811feaa6528c99981debfbd13fff7c737462fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06 10:06:39 +00:00
Nathalie Le Clair
7b4e6dc561 Merge "HDMICEC: Call setArcStatus in setArcMode" 2023-02-06 09:49:15 +00:00
Sorin Basca
1f887e17c8 Pin tradefed dependencies to Java 11
Bug: 267831518
Test: TH
Change-Id: I911483e3e203cf65e8bcd3aeb21a3d99ea090e2d
2023-02-04 16:19:39 +00:00
Sudheer Shanka
d1b836e3dd Safely handle the case of BroadcastOptions being null.
BroadcastOptions argument in Context#sendBroadcastMultiplePermissions
API is marked as @Nullable but would result in NPE if a null
BroadcastOptions is passed.

Bug: 264293164
Fix: 261957150
Test: TH
Merged-In: I0847a189bf945d8aa051133c7cff277a8692272d
Change-Id: I0847a189bf945d8aa051133c7cff277a8692272d
(cherry picked from commit 51a6ae01b8)
2023-02-03 17:31:17 -08:00
Venkatarama Avadhani
245f729d44 CAS: Fix integration issues with AIDL
Fix issues with parameters and error handling in CAS AIDL integration
with framework.

Bug: 266169861
Test: atest CtsMediaMiscTestCases
Change-Id: I5d440ae8649782ce063d7879bb5f28f85b359362
2023-02-03 22:34:54 +00:00
Venkatarama Avadhani
46720e796c CAS: Add openSessionDefault
Add support for openSession with no arguments.

Bug: 266169861
Test: atest CtsMediaMiscTestCases

Change-Id: I4e321aa77735eaa019a74ce75f25cd3fe6b79f9b
2023-02-03 22:34:43 +00:00
Venkatarama Avadhani
248dd8cce8 CAS: Disable Descrambler API for AIDL
Bug: 227673974
Test: atest CtsMediaMiscTestCases

Change-Id: I08823c2d58985634f827fa8150e7ca7da0d4fbdf
2023-02-03 22:34:20 +00:00
Alisher Alikhodjaev
b31ec5a974 Revert "Revert "Get PackageManager from Context""
This reverts commit db37a06c60.

Reason for revert: This CL was reverted by mistake

Bug: 263565738
Test: Compiles
Change-Id: I890e44a73b108501b830625eada68322ef63e192
2023-02-03 22:23:15 +00:00
Cole Faust
484c089212 Merge "Fix crash in RequiresPermissionChecker.java" am: ede4a8a9d4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2418000

Change-Id: I912235850ff793a5e7e6f8d64c78a00d7a0843c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 20:31:36 +00:00
Cole Faust
ede4a8a9d4 Merge "Fix crash in RequiresPermissionChecker.java" 2023-02-03 19:59:14 +00:00
Joanne Chung
52b8baf27f Merge "Update voice OWNER file" am: 30a3877337
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2421099

Change-Id: Icb680e828e40753c6cebdb6dc082f888cc0e0631
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 09:47:36 +00:00
Joanne Chung
30a3877337 Merge "Update voice OWNER file" 2023-02-03 09:23:24 +00:00
Joanne Chung
fbf6f125b6 Update voice OWNER file
Bug: 177641730
Test: n/a
Change-Id: Idc025cf9d7e9ccf2928aa54ef93f7ec51604a4e5
2023-02-03 15:22:54 +08:00
Vova Sharaienko
e19dbb3053 [TeX] Introduced Telemetry Express Histogram Logging APIs
- provided Java Counter Histogram metric logging API

Bug: 262791652
Test: ExpressLogTests
Change-Id: I5270ef327f39db28af3c3148f542b3f6bdad44b5
2023-02-03 04:41:15 +00:00
Treehugger Robot
d67be5c22e Merge "Use IPv4v6 as default protocol when APN setting is not available" am: 8c9142fca2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2411508

Change-Id: Ifd7e47b3816b93fdef698104c1767805db656d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-03 03:16:04 +00:00
Treehugger Robot
8c9142fca2 Merge "Use IPv4v6 as default protocol when APN setting is not available" 2023-02-03 02:50:39 +00:00
Seth Moore
89c91ae699 Map RkpProxyException error codes into get key errors
This allows clients of the system service to handle specific errors
returned up the stack from rkpd.

Test: RemoteProvisioningServiceTests
Test: keystore2_test
Change-Id: I4b8399c0c8693533631c3a816e494bd1a2ab3239
2023-02-02 15:03:50 -08:00
Android Build Coastguard Worker
d69be736a7 Merge cherrypicks of ['googleplex-android-review.googlesource.com/19829996'] into tm-qpr2-release.
Change-Id: I042b10ae9f7bd15df457864df9545ff3c584da9a
2023-02-02 21:52:05 +00:00
Oli Lan
74caed951f Validate package name passed to setApplicationRestrictions. (Reland)
This adds validation that the package name passed to
setApplicationRestrictions is in the correct format. This will avoid
an issue where a path could be entered resulting in a file being
written to an unexpected place.

Bug: 239701237
Merged-In: I1ab2b7228470f10ec26fe3a608ae540cfc9e9a96
Change-Id: I56c2fc14f906cdad80181ab577e2ebc276c151c1
(cherry picked from commit 1b9b59c63b)
Merged-In: I56c2fc14f906cdad80181ab577e2ebc276c151c1
2023-02-02 21:50:56 +00:00
Cody Northrop
5f16d9929f Merge "Add EGL blobcache multifile properties" am: 8ccb2f122c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2402342

Change-Id: I4608ebfe7051aaf3a997d6e8e4b8b76a813a3392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 21:15:48 +00:00
Sorin Basca
cb01838b8b Merge "Disable ds-docs-switched" am: 673132ad6b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2276633

Change-Id: Ia4f731469be3ece09c3f72c223aa5e66227b8b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 21:09:54 +00:00
George Chang
9f0f23a883 Merge "Add more details in the javadocs for getTagIntentAppPreferenceForUser" am: 4a89fb33f4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2411149

Change-Id: Icc50892e1b0929dc97e90c69d20a393b9c336665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 21:01:23 +00:00
Cody Northrop
8ccb2f122c Merge "Add EGL blobcache multifile properties" 2023-02-02 20:55:50 +00:00
Venkatarama NG. Avadhani
4f3044e93e HDMICEC: Call setArcStatus in setArcMode
If the TV is available, call setArcStatus also when binder service's
setArcMode is called.

Bug: 177973980
Bug: 187168483
Test: adb shell cmd hdmi_control setarc on
Change-Id: I60060bdd37df30b25963c012a0d5e4549bf45ff7
2023-02-02 12:36:20 +00:00
Sorin Basca
673132ad6b Merge "Disable ds-docs-switched" 2023-02-02 11:38:32 +00:00
Artem Vursalov
d682068899 battery LED: nearly full level is now configurable
Nearly full level of battery was hardcoded as 90 in BatteryService code. With this change it is possible to adjust in via config.xml

Test: manual tests. It's possible to test in the emulator with additional logs. lunch sdk_phone_x86 && m && emulator => emulate battery changes
Signed-off-by: Artem Vursalov <artyomvoid@fb.com>
Change-Id: Id632424b5819fba2abe82b28af0f1993688db2e2
2023-02-02 10:09:00 +00:00
George Chang
4a89fb33f4 Merge "Add more details in the javadocs for getTagIntentAppPreferenceForUser" 2023-02-02 06:42:03 +00:00
George
2d2314a038 Add more details in the javadocs for getTagIntentAppPreferenceForUser
Bug: 266675647
Bug: 244272155
Test: build pass
Change-Id: Id5e177e8aa4b818bb15521907a7dfa915a9b12a6
2023-02-02 02:50:27 +00:00
Roman Kiryanov
7bdece286a Merge "Allow the host to send empty clipboards to the guest" am: d20bc58ae9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2415825

Change-Id: I8b6ec791f558933f3111006d26e6d651785267eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02 02:00:49 +00:00
Cole Faust
a5f2ae0dcb Fix crash in RequiresPermissionChecker.java
Bug: 265320139
Test: atest --host error_prone_android_framework_test
Change-Id: Ia46d5e7cab4d39888c4975ded18c59d5eb918ffa
2023-02-01 17:34:56 -08:00
Roman Kiryanov
d20bc58ae9 Merge "Allow the host to send empty clipboards to the guest" 2023-02-02 01:27:29 +00:00
Roman Kiryanov
8c0d9b5a76 Allow the host to send empty clipboards to the guest
the check was too strict.

Bug: 266956109
Test: check if clipboard sync host->guest
Change-Id: Id63612e8e7b5264af4def4e1f5ed5c1e25995b4c
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-02-01 15:35:33 -08:00
Yan Yan
8bdf0c9b14 Define @IntDef for setRestrictedUnderlyingNetworkTransports
This commit also improves the API doc to explain the result of a
network being restricted.

Bug: 262448368
Test: make
Change-Id: Idb7fde0f925048b4abba55b6f6b74a27c0a37bd3
2023-02-01 23:25:13 +00:00
Santiago Seifert
1e9a408dc6 Merge "Add aquilescanta to SettingsLib owners" am: e0eab7ed87
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2417312

Change-Id: Ib5edbe311f6187804bc607485a53867ca25fa9f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-01 17:03:15 +00:00