Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
787,678 Commits 3 Branches 0 Tags
4ab2bc56dd92e232fbdcfd1f59dc60a7cd463dcc
Commit Graph

11063 Commits

Author SHA1 Message Date
Treehugger Robot
416d479225 Merge "Update doc for audio-coupled-haptic related stuff." am: fe752fc2b4 am: 1fe0a419aa am: 4ce721d428 am: eddf6d85c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2142192

Change-Id: Ifed67552955d00b8ce020859346c4daee3debe14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 00:36:04 +00:00
Treehugger Robot
1fe0a419aa Merge "Update doc for audio-coupled-haptic related stuff." am: fe752fc2b4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2142192

Change-Id: I3f5cfa8f028fba4807a95834920737b68dd73dd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-07 23:25:33 +00:00
Treehugger Robot
fe752fc2b4 Merge "Update doc for audio-coupled-haptic related stuff." 2022-07-07 23:02:03 +00:00
jiabin
60cf4a5b02 Update doc for audio-coupled-haptic related stuff. 
When using audio-coupled-haptic playback, the haptic channels will be
muted if the app doesn't have the vibrate permission. Update the doc to
state that apps should hold vibrate permission to make
audio-coupled-haptic works as expected.

Bug: 236586224
Test: make
Change-Id: I69c1332d39f997a61f3a969d652144d829de9659
 2022-07-06 16:32:29 +00:00
Naomi Musgrave
cf1dc5c71b Merge "[Partial Screenshare] Set WindowContainerToken for task capture" into tm-qpr-dev am: 7430d775c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918928

Change-Id: I69a714482db0dc597e921ef48f8db8e0d4d99fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:24:36 +00:00
Naomi Musgrave
6254236666 [Partial Screenshare] Set WindowContainerToken for task capture 
The launch cookie of the target task will be provided by SysUI;
convert this to the WindowContainerToken so the ContentRecorder
can capture the correct layer of the hierarchy.

Bug: 235984372
Test: atest WmTests:WindowManagerServiceTests
Change-Id: I52f69cd078dd5b8ba6cb5b1c292423773dbd8123
 2022-06-27 17:52:09 +00:00
Oliver Woodman
78d4ab4420 Merge "Proactively unparcel bitmaps in MediaMetadata" into tm-dev am: 1574fbe57c am: fbb13d7bb9 am: 2a66534e3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918926

Change-Id: I9956c98274ee3e7560e397b06b14db200af096ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:31:14 +00:00
Oliver Woodman
52603aed4e Merge "Proactively unparcel bitmaps in MediaMetadata" into tm-dev am: 1574fbe57c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918926

Change-Id: Ied35c63444b8096d634097f705dd1635801cc345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 19:30:35 +00:00
Oliver Woodman
a110072a44 Proactively unparcel bitmaps in MediaMetadata 
This ensures that the GC accounts for the underlying allocations

Bug: 215820910
Test: Manual
Change-Id: I6b1d3f17abdb513b1ac929267b3d386326fa83c4
 2022-06-16 12:12:42 +00:00
Wonsik Kim
84959301fb Merge "Revert "MediaCodec: don't cache buffers until requested"" into tm-dev 2022-06-14 21:48:41 +00:00
Wonsik Kim
bc7d1172e0 Revert "MediaCodec: don't cache buffers until requested" 
This reverts commit d59a075f79.

Reason for revert: regression (see b/235925715)
Fixes: 235925715
Bug: 189889230
Test: manual

Change-Id: I2e52c3abdd13fa0547a510b3599e082e3bff0989
 2022-06-14 20:01:22 +00:00
TreeHugger Robot
92c7cf10a9 Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756431

Change-Id: I2e3f79f91e5fb820459b50279a72317dfad8d6e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 07:04:41 +00:00
Jakub Tyszkowski
a1728774ae aidl: Fix missing conversion logic for broadcast device 
Bug: 234707737
Test: atest AidlConversionUnitTests
Change-Id: I32e2ae9d6d433fb49e76ed3079cf85639eb71486
Merged-In: I32e2ae9d6d433fb49e76ed3079cf85639eb71486
(cherry picked from commit 2d1b9ae095)
 2022-06-07 01:22:04 +00:00
Jon Eckenrode
c0ff999651 Merge "Revised the API documentation for the getMediaProjection() method." into tm-dev am: 0cfcaa28ee am: 2382724518 am: 1ae9afd5c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635346

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

Change-Id: Ic9cc2a39da58baec3ee894649fe270724683a0e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:26:18 +00:00
Jon Eckenrode
1ae9afd5c4 Merge "Revised the API documentation for the getMediaProjection() method." into tm-dev am: 0cfcaa28ee am: 2382724518 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635346

Change-Id: Id71acf216097cbbe49c855e392416cc35e7c6476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:17:22 +00:00
Jon Eckenrode
85fffa5a65 Merge "Revised the API documentation for the getMediaProjection() method." into tm-dev am: 0cfcaa28ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635346

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

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

Change-Id: Ia44f6eec201856cb11beeb5ed719d102e36f8e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:11:56 +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
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
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
42094ae71b Merge "Allow LNB to be opened before Frontend" into tm-dev am: 9dd35d01f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18635147

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

Change-Id: I7c1cbcfbaf478d56523f89e57ca13a7cc06331ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 19:13:25 +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
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
383e903ab7 Merge "media: clarify that flush() is not supported for encoders." into tm-dev am: 381a3b6691 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590094

Change-Id: I8efaec85e37a0b015b384661a61dd0c2920ec822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:04:11 +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
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
341487c321 Merge "media: clarify MediaFormat.KEY_FRAME_RATE for video encoders" into tm-dev am: 42e8a2285c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18605610

Change-Id: I772ea091c45c35b328f69982e47506ce70f69d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 07:35:54 +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
TreeHugger Robot
d7d0d4b1ab Merge "MediaCodec: don't cache buffers until requested" into tm-dev 2022-05-23 17:13:42 +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
465c1878ad Merge "SpatializerHelper: Deliver metrics to MediaMetrics" into tm-dev am: e2049a8968 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18510742

Change-Id: I7d8551e19ffdd1ef8b1476438b6beb0ebdae30ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 09:30:05 +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
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
0425bd34f8 Merge "[Media Projection] Require valid token to set session" into tm-dev am: 55ecb4ec82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356863

Change-Id: I764b3935e77de41478129bab9cb896f11e415177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 14:00:26 +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
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
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