summaryrefslogtreecommitdiff
path: root/media/java/android
Commit message (Collapse)AuthorAgeFilesLines
* Prevent media button receivers targeting activitiesIván Budnik2025-07-081-9/+14
| | | | | | | | | | | | | | | | | This enforcement prevents a bypass of background activity launches. For versions before Android V, the enforcement just ignores the request and logs a warning. This change is a backport of ag/23810567. Test: Manually. Bug: 272737196 Bug: 272024837 Bug: 317203980 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d455e21711c167223f7d0696809a4e411683182c) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:039ead905eb66d37154fe6bbf16b87863ad79265) Merged-In: I2412633c0b3afda6776244c72043d0dd78a4c8a1 Change-Id: I2412633c0b3afda6776244c72043d0dd78a4c8a1
* RingtoneManager: allow video ringtone URIJean-Michel Trivi2024-11-181-2/+6
| | | | | | | | | | | When checking the MIME type for the default ringtone, also allow it to refer to video content. Bug: 205837340 Test: see POC + atest android.media.audio.cts.RingtoneManagerTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de83ef4f51cad7ea1eb91f5d328d79b719251abe) Merged-In: Iac9f27f14bae29e0fabc31e05da2357f6f4f16c7 Change-Id: Iac9f27f14bae29e0fabc31e05da2357f6f4f16c7
* Fix security vulnerability allowing apps to start from backgroundBishoy Gendy2024-08-271-2/+11
| | | | | | | | | Bug: 317048338 Test: Using the steps in b/317048338#comment12 (cherry picked from commit c5fc8ea92c0aabbb2fdccc23b743c18a8bf62e64) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:df3584bb93ab89d7e174f7d39e42d4b22cb92fe0) Merged-In: Ia91199fdb23beed27bde687fdca8fe5d3a5a4759 Change-Id: Ia91199fdb23beed27bde687fdca8fe5d3a5a4759
* AudioService: anonymize Bluetooth MAC addressesEric Laurent2024-02-171-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure APIs returning AudioDeviceAttributes from AudioService anonymize the Bluetooth MAC addresses because those are considered privacy sensitive. Only expose the full MAC address to system and apps with BLUETOOTH_CONNECT permission. setters, getters and listeners for preferred device for strategy, preferred device for capture preset and mute await connection are modified: - when entering AudioService, full MAC addresses are retrieved based on the known Bluetooth devices stored in AudioDeviceInventory.mDeviceInventory - when exiting AudioService, MAC addresses are anonymized if the client app does not have BLUETOOTH_CONNECT permission or is not a system component APIs based on AudioDeviceInfo do not need to be modified as the AudioDeviceInfo MAC address is for the AudioPort cached in the app process and AudioPorts are anonymized by the native audioserver before being returned to client apps. Bug: 285588444 Test: atest AudioManagerTest Test: atest RoutingTest Test: atest AudioCommunicationDeviceTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4c1d23ed19823b2706866201eded0c556f83e018) Merged-In: I67bbba2ba941c97138a068d640079b17650e3d86 Change-Id: I67bbba2ba941c97138a068d640079b17650e3d86 Change-Id: I2b981ceafbb76c19f0d5c51f7d36ef115c0fd15b
* Refactor the SADeviceState to AdiDeviceStateVlad Popa2024-02-171-0/+63
| | | | | | | | | | | | | | | | The idea is to have a device state catalog for all the known devices. Also refactored the name of the Settings.Secure key entry for persistence. The current code will check the legacy key first, erase it and update the new key. Test: atest SpatializerHelperTest & AudioDeviceBrokerTest Bug: 278265907 Bug: 285588444 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:41f08b8d70260839a96d1ebb412eb8766b386b76) Merged-In: Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 Change-Id: Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 Change-Id: I1452fcecaa82c466b807235a884ebb8388dd5a27
* RingtoneManager: verify default ringtone is audioJean-Michel Trivi2023-10-071-0/+15
| | | | | | | | | | | | | | | When a ringtone picker tries to set a ringtone through RingtoneManager.setActualDefaultRingtoneUri (also called by com.android.settings.DefaultRingtonePreference), verify the mimeType can be obtained (not found when caller doesn't have access to it) and it is an audio resource. Bug: 205837340 Test: atest android.media.audio.cts.RingtoneManagerTest (cherry picked from commit 38618f9fb16d3b5617e2289354d47abe5af17dad) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b8c2d03b720f0cc200ac59f6cfb411fddc3b119c) Merged-In: I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e Change-Id: I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e
* Merge tag 'android-13.0.0_r67' of ↵George Zacharia2023-08-091-3/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into t13.0 Android 13.0.0 Release 67 (TQ3A.230805.001) * tag 'android-13.0.0_r67' of https://android.googlesource.com/platform/frameworks/base: Merge "Resolve StatusHints image exploit across user." into sc-v2-dev am: e371b3018f Remove unnecessary padding code Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used DO NOT MERGE Verify URI permissions in MediaMetadata Visit URIs in themed remoteviews icons. Check URIs in sized remote views. Fix PrivacyChip not visible issue Update Pip launches to not enter pinned task if in background. Validate ComponentName for MediaButtonBroadcastReceiver Implement visitUris for RemoteViews ViewGroupActionAdd. Check URIs in notification public version. Preserve flags for non-runtime permissions upon package update. On device lockdown, always show the keyguard Ensure policy has no absurdly long strings Verify URI permissions for notification shortcutIcon. Do not load drawable for wallet card if the card image icon iscreated with content URI. ActivityManagerService: Allow openContentUri from vendor/system/product. Change-Id: Ice3533cb5ebf4868cc9aa0500568b899293872ab
| * Validate ComponentName for MediaButtonBroadcastReceiverIván Budnik2023-06-141-3/+5
| | | | | | | | | | | | | | | | | | | | | | This is a security fix for b/270049379. Bug: 270049379 Test: atest CtsMediaMiscTestCases (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c573c83a2aa36ca022302f675d705518dd723a3c) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ba546a306217389a8ff9e5e948612651fd496081) Merged-In: I05626f7abf1efef86c9e01ee3f077d7177d7f662 Change-Id: I05626f7abf1efef86c9e01ee3f077d7177d7f662
* | Merge tag 'android-13.0.0_r52' of ↵George Zacharia2023-08-026-34/+240
|\| | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into t13.0 Android 13.0.0 Release 52 (TQ3A.230605.012) Change-Id: Ic80f318636f1f70bbd009504352ddde511d0dead
| * Enforce @NonNull package name for onMediaKeyEventSessionChangedIván Budnik2023-03-231-1/+1
| | | | | | | | | | | | | | | | | | Previously, listeners could receive unexpected null package names. Test: atest MediaSessionManagerTest Bug: 274082657 Change-Id: I0fdada5ed6d27a02ee0c1ab58423238c7651b5de Merged-In: I0fdada5ed6d27a02ee0c1ab58423238c7651b5de
| * Merge "Merge "Merge "Merge "Update OWNERS for MediaProjection & related ↵Naomi Musgrave2023-03-071-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | classes" into android11-tests-dev am: d6533d0bf9" into android12-tests-dev am: dcf85bf11a" into android12L-tests-dev am: 9a4ae94a32" into android13-tests-dev am: 56db2228c6 am: a8ce54ee33 am: 0fca983e52 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2464453 Change-Id: I05597c45a88a66339627a1656b4f11cb950a4bc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * Merge "Merge "Merge "Merge "Update OWNERS for MediaProjection & related ↵Naomi Musgrave2023-03-061-0/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | classes" into android11-tests-dev am: d6533d0bf9" into android12-tests-dev am: dcf85bf11a" into android12L-tests-dev am: 9a4ae94a32" into android13-tests-dev am: 56db2228c6 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2464453 Change-Id: I55fe08c3ac8a22f083b6198bfdb87b870863fcd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * Merge "Merge "Merge "Update OWNERS for MediaProjection & related classes" ↵Automerger Merge Worker2023-03-021-0/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into android11-tests-dev am: d6533d0bf9" into android12-tests-dev am: dcf85bf11a" into android12L-tests-dev am: 9a4ae94a32 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2441290 Change-Id: Ie77d4f7cabfd0af7c6c2f154ac4fa4f72c77a366 Merged-In: I72b11d6a1f180c44565b50f3f4e8d2673fde3fec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * Merge "Merge "Update OWNERS for MediaProjection & related classes" into ↵Automerger Merge Worker2023-03-011-0/+3
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android11-tests-dev am: d6533d0bf9" into android12-tests-dev am: dcf85bf11a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2441290 Change-Id: I3cdca3c7980fa84bf8fd64d1e33dd375d18fe764 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | * Merge "Update OWNERS for MediaProjection & related classes" into ↵Treehugger Robot2023-03-011-0/+3
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android11-tests-dev am: d6533d0bf9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2441290 Change-Id: I8e1ccc4a9e481c8859ef265a34ef309f56679f52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | | | * Update OWNERS for MediaProjection & related classesNaomi Musgrave2023-02-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5af357405c2b4e2da87954612080fa85d08f991d Bug: 261563516 (cherry picked from commit abccffcc0abf85f4ac87179fc5235bfa3fdbfd8c)
| * | | | | | AudioAttributes: fix setInternalCapturePreset()Eric Laurent2023-02-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 5a594729 aligned the value of capture preset for audio attributes in volume groups between java and native, thus allowing AUDIO_SOURCE_INVALID to be passed to setInternalCapturePreset() by the JNI. Bug: 267588552 Test: atest AudioServiceHostTest#testAudioVolumeGroups Change-Id: Ibf496a9cfc83cd3c3e01bab5cb8c26014207cc87
| * | | | | | AudioManager: restore getVolumeGroupIdForAttributes behaviorEric Laurent2023-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow getVolumeGroupIdForAttributes() to fallback to default volume group as it was before commiti c8e375e0. Bug: 267588552 Test: atest AudioServiceHostTest#testAudioVolumeGroups Change-Id: I571ffd8c1b51bbce943bfac4cd4f628e282fcc12
| * | | | | | Merge changes I8c01f31d,I0a2b90d1,I78bfa0d1,I803f9df1,I3ad42802, ... into ↵Eric Laurent2023-01-273-31/+231
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tm-qpr-dev * changes: [IMPR] AudioProductStrategy: add getName hidden API fixup '[IMPR] AudioManager: add adjustAttributesVolume API' [IMPR] AudioService: improve bijectivity between VSS / VGS [BUG] AudioService: fix mute/umute of aliased streams. [IMPR] AudioManager: add adjustAttributesVolume API [IMPR] AudioService: VolumeGroupState: improve implementation [IMPR] AudioProductStrategy: get volume group from AudioAttributes
| | * | | | | | [IMPR] AudioProductStrategy: add getName hidden APIFrançois Gaffie2023-01-271-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As volume group, being able to retrieve strategy name helps clients (e.g. CarAudioService) to refer strategies by name. Bug: 260298113 Test: build Change-Id: I8c01f31d715c754f1449b75fa7c754fe61b04d4a Merged-In: I8c01f31d715c754f1449b75fa7c754fe61b04d4a Signed-off-by: François Gaffie <francois.gaffie@renault.com>
| | * | | | | | [IMPR] AudioManager: add adjustAttributesVolume APIFrancois Gaffie2023-01-272-22/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 237409207 Bug: 260298113 Test: make In order to manage mute / unmute from applications, it is required to align volume per attributes on volume per stream regarding the mute management. Test: adb shell am instrument -w -e class com.android.audiopolicytest.AudioManagerTest#testAdjustStreamVolumeCompatibility com.android.audiopolicytest adb shell am instrument -w -e class com.android.audiopolicytest.AudioManagerTest#testAdjustAttributesVolume com.android.audiopolicytest Signed-off-by: Francois Gaffie <francois.gaffie@renault.com> Change-Id: I3ad42802b8387ecbbb15a54774f4d2da0fed0988 Merged-In: I3ad42802b8387ecbbb15a54774f4d2da0fed0988
| | * | | | | | [IMPR] AudioProductStrategy: get volume group from AudioAttributesFrancois Gaffie2023-01-271-9/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds an API to find a volume group from a given audio attributes. It allows to fallback or not on default volume group. Bug: 260298113 Test: adb shell am instrument -w -e class com.android.audiopolicytest.AudioManagerTest com.android.audiopolicytest adb shell am instrument -w -e class com.android.audiopolicytest.AudioProductStrategyTest com.android.audiopolicytest adb shell am instrument -w -e class com.android.audiopolicytest.AudioVolumeGroupTest com.android.audiopolicytest adb shell am instrument -w -e class com.android.audiopolicytest.AudioVolumeGroupChangeHandlerTest com.android.audiopolicytest Signed-off-by: Francois Gaffie <francois.gaffie@renault.com> Change-Id: I2aaf64fbe0c0fac3bb0110d847453eaf34f80792 Merged-In: I2aaf64fbe0c0fac3bb0110d847453eaf34f80792
| * | | | | | | AudioManager: relax exceptions for setCommunicationDeviceEric Laurent2023-01-201-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not throw an IllegalArgumentException exception in setCommunicationDevice() if the selected device is not connected any more but return false instead; This race condition cannot be avoided programmatically. Bug: 264837721 Test: manual regression tests for call routing Change-Id: I6ba0c81b89a5871a210a115885836693e4972fcb
* | | | | | | Merge tag 'android-13.0.0_r35' of ↵George Zacharia2023-04-0310-76/+196
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/base into t13.0 Android 13.0.0 release 35 Change-Id: I709958b2f015d1774b2ece25894467c3a279f93c
| * | | | | | Merge "ImageWriter: remove mCloseLock guard from queue and dequeue ↵Avichal Rakesh2023-01-041-58/+52
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | operations" into tm-qpr-dev
| | * | | | | | ImageWriter: remove mCloseLock guard from queue and dequeue operationsAvichal Rakesh2022-12-291-58/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mCloseLock currently guards #queueInputImage, #dequeueInputImage, and #postEventFromNative. However, there have been cases reported where a contention between #postEventFromNative and #queueInputImage would lead to a deadlock. This CL removes the mCloseLock guard from #queueInputImage and #dequeInputImage as the native implementations are already synchronized on `this` and there are no reported bugs from race conditions in those two functions. It also drops the mCloseLock guard from #postEventFromNative and moves the responsibility of ensuring ImageWriter is valid to the ListenerHandler. This ensures that mCloseLock is never in contention in the JNI thread that calls #postEventFromNative. #close() is still protected by mCloseLock to prevent multiple simultaneous closes. Bug: 263395157 Test: Existing ImageWriter tests pass Ran the sequence that led to deadlock 30 times without a single deadlock. Change-Id: I5b0d367cce7df9401386e5a53c5e9b539d8c1f40
| * | | | | | | Merge changes from topic "mbr-component-name-sc-dev" into sc-qpr1-dev am: ↵Iván Budnik2022-12-302-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88640ff388 am: 9c033a3094 am: d5df787c6c am: b6039f34a7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20482625 Change-Id: I755f7471f58260c66978d4d440f76742a8c701f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | Merge changes from topic "mbr-component-name-sc-dev" into sc-qpr1-dev am: ↵Iván Budnik2022-12-302-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88640ff388 am: 9c033a3094 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20482625 Change-Id: I6c2772edae580120902c4a171205eeed8a1e1d1a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | * \ \ \ \ Merge changes from topic "mbr-component-name-sc-dev" into sc-qpr1-dev am: ↵Iván Budnik2022-12-302-2/+2
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88640ff388 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20482625 Change-Id: I72bc56bf2961b5bfa19dcad2361677f9b0484eb2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | | | * | | | [automerge] Enforce MediaButtonReceiver extracted component name matches ↵Iván Budnik2022-11-152-2/+2
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | session package name 2p: 48c3882778 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20482625 Bug: 244312001 Bug: 238177121 Change-Id: I6729db5ac57b7fbf5953cad8450fd9e1b07fc40d Merged-In: Ifac9cf53889222e31d18c14c1e096ee68c0a346c
| | | | | * | | | Enforce MediaButtonReceiver extracted component name matches session package ↵Iván Budnik2022-11-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name This change makes sure that the extracted component name in a MediaButtonReceiverHolder matches the Media Session owner's package name. This avoids incorrectly routing media button events and potential security issues. Bug: 244312001 Bug: 238177121 Test: atest CtsMediaBetterTogetherTestCases Change-Id: Ifac9cf53889222e31d18c14c1e096ee68c0a346c (cherry picked from commit 185c3e252397bfa37592edbb5b2f5ae97db92eda) Merged-In: Ifac9cf53889222e31d18c14c1e096ee68c0a346c
| * | | | | | | | Make ImageWriter thread safeAvichal Rakesh2022-12-131-60/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The various functions in ImageWriter were not protected by a lock, which led to segfaults under certain race conditions. This CL adds a mutex to prevent ImageWriter methods from executing while ImageWriter is closing. This also prevent multiple calls to close from executing simultaneously. It also adds a simialar mutex to WriterImageSurface to prevent simultaneous calls to close(). Bug: 244262872 Test: mediaframeworktest:com.android.mediaframeworktest.stress Change-Id: I44976e5a36154ce98f64e2982865b2defcec7f5e
| * | | | | | | | Merge "Update documentation for Image to be clear on valid format enums." ↵TreeHugger Robot2022-11-291-5/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into tm-dev am: 82409626b9 am: f638686c4e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17006063 Change-Id: I9f72471db02d7d450e162495f7d68d83ae034af3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| | * | | | | | | Merge "Update documentation for Image to be clear on valid format enums." ↵TreeHugger Robot2022-11-291-5/+10
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | into tm-dev
| | | * | | | | | Update documentation for Image to be clear on valid format enums.Eino-Ville Talvala2022-02-241-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix the number of planes for P010. Change-Id: I5ef743478f4b93a68706acce73eabd72f6b89b2e
| * | | | | | | | Merge "Set docking ringtone to be played from builtin speaker." into tm-qpr-devTreeHugger Robot2022-11-291-0/+35
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Set docking ringtone to be played from builtin speaker.Mingyu Kang2022-11-171-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: b/227256896 Test: Dock the device Change-Id: I71bbd79fcd6652028dfd0264e42f947c732a1b2e Merged-In: I71bbd79fcd6652028dfd0264e42f947c732a1b2e
| * | | | | | | | | AudioDeviceVolumeManager and VolumeInfo API changesJean-Michel Trivi2022-11-254-49/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Context service name for accessing AudioDeviceVolume manager. Add support in VolumeInfo to know whether it carries an explicit mute/unmute information (vs just default value of isMuted()). Bug: 244326361 Test: atest android.media.audio.cts.AudioDeviceVolumeManagerTest Test: atest android.media.audio.cts.VolumeInfoTest Change-Id: Id718fbd7e0d5795ac480d9188faad4a70fba9808 Merged-In: Id718fbd7e0d5795ac480d9188faad4a70fba9808
| * | | | | | | | | Fix AudioDeviceInfo.TYPE_DOCK device mappingJean-Michel Trivi2022-11-231-4/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make TYPE_DOCK always map to the digital dock and vice-versa. Bug: 253118335 Test: atest android.media.audio.cts.AudioDeviceInfoTest Change-Id: If4c975fd43f5f96c7804573013795226781f68dd Merged-In: I160875e74b29739a0232d6a7b833c3927433e067
* | | | | | | | | Don't change public APILuca Stefani2023-01-312-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This is fine on master, but not on REL branches Change-Id: I4baa4e26df8f39a9e46d1d68129a1f7039244882 Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
* | | | | | | | | Merge tag 'android-13.0.0_r16' into t13.0George Zacharia2022-12-1512-252/+384
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 13.0.0 Release 16 (TQ1A.221205.011) Also included the following reverts: 1. Revert "fw/b: Import Wi-Fi standard icon [1/2]" 2. Revert "Add preference for toggling the wallpaper zooming animation" Co-authored-by: Semavi Ulusoy <doc.divxm@gmail.com> Change-Id: I9a6b51e452c28d10411712c59778bb54da5783e9
| * | | | | | | | Simplify MediaRouter2Manager.Client's lifecycleSantiago Seifert2022-09-231-33/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherrypick of commit 3aa151259cc138f7ab1de355fae87004d09ac1db. Test: atest MediaRouter2ManagerTest Bug: 239926177 Change-Id: I363dc3918465de7fdb74f833fae78f46bde72a37 Merged-In: I363dc3918465de7fdb74f833fae78f46bde72a37
| * | | | | | | | Remove unnecessary if checksSantiago Seifert2022-09-231-72/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherrypick of commit 58fb7d617d8f6f504ecfb746ffcba7b1179e6eb6. Bug: 239926177 Test: atest mediaroutertest CtsMediaBetterTogetherTestCases Change-Id: I8478669747ca291d92b825e205f58add76e9a2a2 Merged-In: I8478669747ca291d92b825e205f58add76e9a2a2
| * | | | | | | | Manage scan requests in MediaRouter2ManagerSantiago Seifert2022-09-232-28/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherrypick of commit d9ac018756b3a52bd4c65d1c3ba7488c40b42381. Before this change, MediaRouter2Manager (singleton) does not protect clients against independent changes to the scanning state, which means one client can stop the scan while another needs scanning to go on. After this change, MediaRouter2Manager keeps count of the calls to request scanning, and will only request scanning from the system server while there is at least one active scan request (via registerScanRequest). This change does not affect MediaRouter2.start/stopScan. Bug: 232812007 Test: atest CtsMediaBetterTogetherTestCases Change-Id: I8d80872d7c55791b9a429180da1c68af50ae13b7 Merged-In: I8d80872d7c55791b9a429180da1c68af50ae13b7
| * | | | | | | | Rethrow MediaRouter2Manager RemoteExceptionsSantiago Seifert2022-09-231-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherrypick of commit 147cb7c877be5e9ef457bdd602f07374c0c016e3. Said exceptions mean the system server died, after which guidance suggests it's not a good idea to silently swallow said exception. Specially considering the client will be restarted shortly after the system server dies. Bug: 232812007 Test: atest MediaDeviceManagerTest MediaDataCombineLatestTest CtsMediaBetterTogetherTestCases Change-Id: I21a724896684d79097ae74df2d5a54e60514ebdf Merged-In: I21a724896684d79097ae74df2d5a54e60514ebdf
| * | | | | | | | Merge "MediaCodec: skip index validation at buffer validations" into tm-qpr-devWonsik Kim2022-09-131-14/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | MediaCodec: skip index validation at buffer validationsWonsik Kim2022-09-121-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The index validation will happen at the MediaCodec native layer. Bug: 244121189 Test: atest CtsMediaCodecTestCases Test: atest CtsMediaDecoderTestCases Test: atest CtsMediaEncoderTestCases Test: atest CtsMediaV2TestCases Merged-In: I1af0cd61ae19e86a115b5e347625b8476440e848 Change-Id: I1af0cd61ae19e86a115b5e347625b8476440e848
| * | | | | | | | | Merge "Fix to allow setting URI without recreating ringtone" into tm-qpr-devTreeHugger Robot2022-09-122-47/+121
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix to allow setting URI without recreating ringtoneEdgar Arriaga2022-09-092-47/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch splits the behavior of creating the media player and the uri setter and avoids it from being recreated upon being retrieved by getRingtone which harms performance causing a double asset load. Bug: 240621827 Test: Receive a phone call and verify ringtone works Change-Id: I91563ddcc94f25911937e9fbb35ff36bbe9d3012
| * | | | | | | | | Merge "LeAudio: Fix volume control" into tm-qpr-devTreeHugger Robot2022-09-121-0/+8
| |\ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-12 16:11:16 +0000