Commit Graph

11128 Commits

Author SHA1 Message Date
Matt Gilbride
061eac8300 Merge "Remove errorprone BinderIdentityTokenChecker" 2022-06-07 16:10:37 +00:00
Iván Budnik
c26fe9bc12 Merge "Fix remote volume adjustment for Android U" 2022-06-07 13:30:31 +00:00
Iván Budnik
b855234259 Fix remote volume adjustment for Android U
Bug: 228021646
Test: Manual
Change-Id: I5d637103fffe2b83fdbae1730a4c9813410185a8
2022-06-06 13:03:41 +00:00
Jon Eckenrode
f5cba2a14e Merge "Revised the API documentation for the getMediaProjection() method." into tm-dev am: 0cfcaa28ee am: 4e413fa579
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635346

Change-Id: I9e14c5e9c6ddc28df89301660b1ef9624f45366f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:20:48 +00:00
TreeHugger Robot
154a214a3c Merge "media: return null when there are no CamcorderProfiles for getAll" into tm-dev am: 2edaa3a126 am: 636d1b6901
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18721254

Change-Id: I16a80be8becda2b6bf0e1589cd77cb29d05cf8fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-04 00:15:59 +00:00
Jon Eckenrode
0cfcaa28ee Merge "Revised the API documentation for the getMediaProjection() method." into tm-dev 2022-06-03 23:36:13 +00:00
Lajos Molnar
fee968da45 media: return null when there are no CamcorderProfiles for getAll
The API says that null is returned, but an exception was thrown.

Also correct a misleading word in the getAll description.

Bug: 232286218
Change-Id: Iee336628753fad29bb5fccff211e4997fb51a99b
2022-06-02 15:06:20 -07:00
Grzegorz Kolodziejczyk
11337c36f7 Merge "aidl: Fix missing conversion logic for broadcast device" into tm-qpr-dev am: f3d2d183bb am: bc0926a8ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18674055

Change-Id: I46c9d201d97b0d801d6d5b747779e7d1bd27deb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 11:21:09 +00:00
Grzegorz Kolodziejczyk
bc0926a8ea Merge "aidl: Fix missing conversion logic for broadcast device" into tm-qpr-dev am: f3d2d183bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18674055

Change-Id: I3d22a1cbbd261874b89ff24a71cce3b01af23dfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 10:55:13 +00:00
Jakub Tyszkowski
2d1b9ae095 aidl: Fix missing conversion logic for broadcast device
Test: atest AidlConversionUnitTests
Change-Id: I32e2ae9d6d433fb49e76ed3079cf85639eb71486
2022-06-01 14:46:00 +00:00
Azhara Assanova
020ccc4160 Remove errorprone BinderIdentityTokenChecker
The checks in BinderIdentityTokenChecker are implemented in
AndroidFrameworkLintChecker in frameworks/base/tools/lint.

Bug: 157626959
Test: atest error_prone_android_framework_test
Test: m framework-minus-apex
Change-Id: Iac9128dbc7e915a12080e41a66d19f9390e4b58a
2022-05-31 10:55:16 +00:00
Henry Fang
e83b5e7bb9 Merge "Allow LNB to be opened before Frontend" into tm-dev am: 9dd35d01f8 am: 88f77abcd2 am: 3d70f2c73f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635147

Change-Id: I659af602ce7ef0b639da640c4f8a4b01087d4d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-28 19:57:27 +00:00
Henry Fang
e5a504e2bd Merge "Allow LNB to be opened before Frontend" into tm-dev am: 9dd35d01f8 am: e4960b24f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635147

Change-Id: I0f43035968fbe3bc66c53555af0feace2ced0663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-28 19:37:47 +00:00
Henry Fang
9dd35d01f8 Merge "Allow LNB to be opened before Frontend" into tm-dev 2022-05-28 18:43:29 +00:00
Lajos Molnar
86e9b3797b Merge "media: clarify that MediaFormat.KEY_LEVEL is required when specifying a profile" into tm-dev am: 894dabfbb2 am: 214f18d73d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605849

Change-Id: Ic67676fc05a956da9de231bd824f1548c6eca432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 23:08:43 +00:00
joneckenrode
9c28afbf90 Revised the API documentation for the getMediaProjection() method.
Test: Built API documentation
Bug: 233914615
Signed-off-by: joneckenrode <joneckenrode@google.com>
Change-Id: I722d2b0223603b265b68437eea12248b8002b501
2022-05-27 22:01:59 +00:00
TreeHugger Robot
1810d812d6 Merge "Extended audio focus test API to handle external audio focus policy" 2022-05-27 21:15:27 +00:00
Lajos Molnar
fd4b04daed Merge "media: clarify that MediaFormat.KEY_LEVEL is required when specifying a profile" into tm-dev am: 894dabfbb2 am: 8193486750 am: 6a9090be80
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605849

Change-Id: Ie34cc7a609d0eba5056d916e1baacab28859078d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 19:37:37 +00:00
Lajos Molnar
894dabfbb2 Merge "media: clarify that MediaFormat.KEY_LEVEL is required when specifying a profile" into tm-dev 2022-05-27 18:54:26 +00:00
Henry Fang
e6983c1f66 Allow LNB to be opened before Frontend
Change-Id: If7e82db95dda80a90767d7808b140ebcb175ab97
bug: 233830709
Test: atest TunerTest.java
2022-05-27 17:47:31 +00:00
TreeHugger Robot
c86f4e0ff9 Merge "media: clarify that flush() is not supported for encoders." into tm-dev am: 381a3b6691 am: 946aeccb28 am: e113210f3b am: 17127f637f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590094

Change-Id: I156a3594e569e3ec93ca77f0a395652b9f3b9bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:41:13 +00:00
TreeHugger Robot
17127f637f Merge "media: clarify that flush() is not supported for encoders." into tm-dev am: 381a3b6691 am: 946aeccb28 am: e113210f3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590094

Change-Id: I2ca97109a024644fa5059450d4013706384b8127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:08:00 +00:00
TreeHugger Robot
381a3b6691 Merge "media: clarify that flush() is not supported for encoders." into tm-dev 2022-05-26 09:56:47 +00:00
Lajos Molnar
ba2ebf6fb1 Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a2285c am: 32caee0675 am: c46e9f6947 am: 5b5b8be9eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605610

Change-Id: Iad36b54e5911a24063b53bd282e555cb13e1c9ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 08:46:20 +00:00
Lajos Molnar
5b5b8be9eb Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a2285c am: 32caee0675 am: c46e9f6947
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605610

Change-Id: I6bbba22597f72283dcc4911d826b5f8dd3b8e953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 08:14:26 +00:00
Lajos Molnar
062784a9f2 media: clarify that flush() is not supported for encoders.
Bug: 146022133
Change-Id: If1083bb6c6193b01bdd29e60dfc907df8e052663
2022-05-25 17:11:09 -07:00
Lajos Molnar
2e9d9128de media: clarify MediaFormat.KEY_FRAME_RATE for video encoders
Bug: 228530100
Change-Id: I4fb6d1228f9e84541e2048ac6dfe29d4f8939c02
2022-05-25 15:40:33 -07:00
Lajos Molnar
269a560b37 media: clarify that MediaFormat.KEY_LEVEL is required when specifying a profile
Also further clarify the meaning of level and profile.

Bug: 219899706
Change-Id: Ibf8e821a1c97173521163d7a3bb956d85194048d
2022-05-25 15:34:48 -07:00
Oscar Azucena
3209c346d4 Extended audio focus test API to handle external audio focus policy
Bug: 232472353
Test: atest AudioFocusTest
Change-Id: I0d1928c340380e368ce80657dc20106ecb57aed3
2022-05-24 01:38:32 +00:00
TreeHugger Robot
d7d0d4b1ab Merge "MediaCodec: don't cache buffers until requested" into tm-dev 2022-05-23 17:13:42 +00:00
Oliver Woodman
eb72c55665 Fix lat/long rounding error
Use of Math.round fixes incorrect rounding of negative
lat/long values.

Bug: 232327925
Test: atest CtsMediaTestCases
Change-Id: I9e1fd3ec9d64461f0ec223ca091bb8aeb737c952
2022-05-23 15:54:19 +00:00
Eric Laurent
ec890517d1 Merge "SpatializerHelper: Deliver metrics to MediaMetrics" into tm-dev am: e2049a8968 am: 6280ea5e63 am: 39cf0dcd14 am: 735965fa7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18510742

Change-Id: Ib838b2d5ae7d86eae16c003400371a2aff11fb22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 10:43:38 +00:00
Eric Laurent
735965fa7c Merge "SpatializerHelper: Deliver metrics to MediaMetrics" into tm-dev am: e2049a8968 am: 6280ea5e63 am: 39cf0dcd14
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18510742

Change-Id: Ibb83f83b77b284ef80cd9da2defcb686add3849e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 10:06:39 +00:00
Eric Laurent
e2049a8968 Merge "SpatializerHelper: Deliver metrics to MediaMetrics" into tm-dev 2022-05-23 09:11:41 +00:00
Andy Hung
b71ee9b9c9 SpatializerHelper: Deliver metrics to MediaMetrics
Added minor optimization to prevent unnecessary
spatial device update.

Test: adb shell dumpsys media.metrics
Bug: 203434487
Change-Id: If35ab4362c95b3559567296acc756527eeb42680
2022-05-20 14:05:22 -07:00
Naomi Musgrave
c5a1a8b0fe Merge "[Media Projection] Require valid token to set session" into tm-dev am: 55ecb4ec82 am: 986c517b77 am: fa30ad6853 am: cb0d7f43a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356863

Change-Id: I518249d759ec459d13d8246bd15a1f71bd4bd43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 16:32:18 +00:00
Naomi Musgrave
cb0d7f43a0 Merge "[Media Projection] Require valid token to set session" into tm-dev am: 55ecb4ec82 am: 986c517b77 am: fa30ad6853
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356863

Change-Id: I6628d4dd134d59873fed774ba904650d9c1c33d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 16:14:04 +00:00
Naomi Musgrave
55ecb4ec82 Merge "[Media Projection] Require valid token to set session" into tm-dev 2022-05-20 13:39:48 +00:00
Wonsik Kim
d59a075f79 MediaCodec: don't cache buffers until requested
Bug: 189889230
Test: manual & presubmit
Change-Id: I4caca59d6854416cedb6758fe66aefaacb69beb7
(cherry picked from commit 07358dfea5)
Merged-In: I4caca59d6854416cedb6758fe66aefaacb69beb7
2022-05-19 23:25:27 +00:00
Santiago Seifert
4dc4b33b93 Document garbage collection in MediaPlayer
Bug: 140294931
Change-Id: I0be8121cf63fb8f0f6e91e46ba1ba3f62f5cf954
Test: N / A. Javadoc change.
2022-05-18 17:39:04 +00:00
Naomi Musgrave
e3f6b7e16a [Media Projection] Require valid token to set session
When MediaProjection sets the session details in
MediaProjectiondManagerService, clear and re-set the
calling identity (since we have entered the system server
across the aidl boundary).

Additionaly, verify that the call originated from a valid
MediaProjection session. In the current model for
MediaProjection, signature-level permission
MANAGE_MEDIA_PROJECTION is held by the component that shows the
acceptance dialog to the user. The user allowing some app to
capture with MediaProjection is represented by
the IMediaProjection token (see MediaProjectionManagerService#
isValidMediaProjection).

Bug: 230748205
Test: Manual
Change-Id: Iace8eb7eea6c7a99fba7ea726481461a11bd1c90
2022-05-17 22:11:33 +01:00
Paul Wang
9b2d048e96 Fix comment in AudioManager
Bug: None
Change-Id: I0bbd3942c3c375a330bff83590f6699d6ee8223c
2022-05-17 10:58:03 +00:00
Wonsik Kim
5ff0ed8943 Merge "MediaCodec: don't cache buffers until requested" am: 4f9ab851b3 am: de5a8defbe am: 9f1aca4313 am: 1d97041bab am: 11cd071890
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092586

Change-Id: I8f1c5a11904a47f0afa8af6558a7a49ed722dea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 02:15:51 +00:00
Wonsik Kim
9f1aca4313 Merge "MediaCodec: don't cache buffers until requested" am: 4f9ab851b3 am: de5a8defbe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092586

Change-Id: I5e2b54e679d45fb0d5a6d89577468c594b3c4d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:05:52 +00:00
Wonsik Kim
4f9ab851b3 Merge "MediaCodec: don't cache buffers until requested" 2022-05-14 00:05:05 +00:00
Wonsik Kim
07358dfea5 MediaCodec: don't cache buffers until requested
Bug: 189889230
Test: manual & presubmit
Change-Id: I4caca59d6854416cedb6758fe66aefaacb69beb7
2022-05-14 00:04:51 +00:00
TreeHugger Robot
564de4e0c8 Merge "Fixed a typo" 2022-05-13 23:43:07 +00:00
Yixiao Luo
0a4b075ca5 Merge "TIAS:The oneway flag add in ITvInteractiveAppManagerCallback.aidl" into tm-dev am: a021fd7d31 am: 2f9684499c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18284606

Change-Id: I65882da1c61ddf6691511f201ea478439b7ebdb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 18:23:52 +00:00
Yixiao Luo
8ffe4d06f4 Merge "TIAS:The oneway flag add in ITvInteractiveAppManagerCallback.aidl" into tm-dev am: a021fd7d31
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18284606

Change-Id: Ia4b89860488bb12e49b0a0bcf47d0588155c9b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 17:35:43 +00:00
Yixiao Luo
a021fd7d31 Merge "TIAS:The oneway flag add in ITvInteractiveAppManagerCallback.aidl" into tm-dev 2022-05-13 17:32:44 +00:00