summaryrefslogtreecommitdiff
path: root/media
AgeCommit message (Collapse)Author
2020-12-30Add thread protection for Filter/Descrambler tableHenry Fang
Use weak reference in the tables to allow objects released by caller bug: 174685399 bug: 174711353 Test: manual Change-Id: I760d0a77ad9efe2709a14f0fb8a669f8f16652e1 Merged-In: I760d0a77ad9efe2709a14f0fb8a669f8f16652e1
2020-12-30Support blink scanHenry Fang
Allow scan again if callback and executor are same as before. bug: 173239634 Test: atest -c TunerTest Change-Id: Iec5ba453b3d3d40c0d96fda5c7288b79898d9aea Merged-In: Iec5ba453b3d3d40c0d96fda5c7288b79898d9aea
2020-12-30Change resource claim to sync to avoid resource conflictHenry Fang
bug: 174544018 Test: manual Change-Id: Ib2688da2a85cdad896f9f2814828ce7659c8a695 Merged-In: Ib2688da2a85cdad896f9f2814828ce7659c8a695
2020-12-30free weakref to linearblock when it is destroyHenry Fang
bug: 168331789 Test: Manual Change-Id: Iee1b2618bd5c970b728dbc0301b84ff43debde58 Merged-In: Iee1b2618bd5c970b728dbc0301b84ff43debde58
2020-12-30Merge "Tuner JNI: fix the DATA_READY and DATA_CONSUMED flags" am: ba032abd1a ↵Henry Fang
am: e02a166bb5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536947 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5013f4cab992d89999279577bebe68ac1f5dd4fc
2020-12-30Merge "add offset to calculate buffer size" am: de8ca7332b am: e8efe9e7cdHenry Fang
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536906 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie1d8eb0ded203513f1f631f45632b02a8055f923
2020-12-30Merge "Tuner JNI: fix the DATA_READY and DATA_CONSUMED flags"Henry Fang
2020-12-30Merge "add offset to calculate buffer size"Henry Fang
2020-12-30Merge "Fix typo to get correct innerFec and Annex for cable signal" am: ↵Treehugger Robot
6d1582be99 am: b7172b5bc4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1ce3efa08977e5dbe6462c3fa0b6b26e32c96769
2020-12-30Merge "Tuner JNI: Correct memcpy of C2DataIdInfo" am: 55a580b253 am: 575365367aTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536948 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I046a2ed3bbaece122a563031cd8309021f2401a7
2020-12-30Merge "Release resource before send MSG_RESOURCE_LOST message to TIS" am: ↵Treehugger Robot
eb709b6d88 am: acb16468cb Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536908 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7b2b70e789fd7e2247d246d1c4718d971e791cdc
2020-12-30Merge "Fix issue which Ion handle are free twice." am: d70c636ad4 am: def12823c2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536907 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib0e63d4092fc030f316b5c11261b3a37adb9b5c0
2020-12-30Merge "Fix typo to get correct innerFec and Annex for cable signal"Treehugger Robot
2020-12-30Merge "Tuner JNI: Correct memcpy of C2DataIdInfo"Treehugger Robot
2020-12-30Merge "Release resource before send MSG_RESOURCE_LOST message to TIS"Treehugger Robot
2020-12-30Merge "Fix issue which Ion handle are free twice."Treehugger Robot
2020-12-30Fix typo to get correct innerFec and Annex for cable signalHenry Fang
bug: 165808730 Test: manual Change-Id: I9213246c87512480cb08ab10b102b26f9fd9f681 Merged-In: I9213246c87512480cb08ab10b102b26f9fd9f681
2020-12-29Tuner JNI: Correct memcpy of C2DataIdInfoshubang
Bug: 162778666 Test: mannual test by MTK Change-Id: Ic97717e5fc32d97837e218fe769087b5abece2cb Merged-In: Ic97717e5fc32d97837e218fe769087b5abece2cb
2020-12-29Tuner JNI: fix the DATA_READY and DATA_CONSUMED flagsshubang
Bug: 161481210 Test: cuttlefish Change-Id: Ifd8b03259eff2296d1420695176d34026ba586fd Merged-In: Ifd8b03259eff2296d1420695176d34026ba586fd
2020-12-29Release resource before send MSG_RESOURCE_LOST message to TISshubang
Bug: 163397430 Test: mmm Change-Id: I68e0c8704030e2a5713a5b63cffe8a1fb40873fc Merged-In: I68e0c8704030e2a5713a5b63cffe8a1fb40873fc
2020-12-29Fix issue which Ion handle are free twice.Henry Fang
bug: 162083545 Test: Manual Change-Id: I3a53fe949ecfdff4614a44cc1ddecdbeaa583dd8 Merged-In: I3a53fe949ecfdff4614a44cc1ddecdbeaa583dd8
2020-12-29add offset to calculate buffer sizeHenry Fang
bug: 160886488 Test: Manual Change-Id: I6890b02c0f5a5732f1302348d7bff773dac1401f Merged-In: I6890b02c0f5a5732f1302348d7bff773dac1401f
2020-12-23Merge changes from topic "comm_routing" am: 8553f77dce am: 10c6362030Eric Laurent
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534433 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib8c5ace4fd7636db42e14523557604fb5d80542a
2020-12-23AudioManager: Add communication device management APIs am: f39726f262 am: ↵Eric Laurent
890a5d474c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534432 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I525bc7d9040f15eb3c60c47ed10629f7d433b660
2020-12-23Merge "Support set/clear/get preferred device for capture preset." am: ↵Eric Laurent
617d14954d am: db95172696 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534430 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic7ff104b7e0aab924ff51950b41ce63ec3a742f3
2020-12-23Audio: use preferred device for strategy for communication routeEric Laurent
Replaced use of forced usage for communication by set preferred device for strategy to control communication route in audio policy manager. Also do not use forced usage for record which was redundant with forced usage for communication. Bug: 161358428 Test: audio smoke tests Change-Id: I665257fc5903b663096104b0424781d9799635a5 Merged-In: I665257fc5903b663096104b0424781d9799635a5
2020-12-23AudioManager: Add communication device management APIsEric Laurent
Add new APIs to manage the audio device used for communication use cases (Cellular calls, VoIP and Video calls). These APIs are meant to replace specific APIs like setSpeakerPhoneOn() and provide a single generic way of configuring the audio device selected for calls. They will be used for newly added device types (e.g. BLE audio) instead of adding new specific APIs. They will also offer more options like for instance allowing to select the earpiece (handset) device when a wired headset is connected. The new APIs are: - boolean setDeviceForCommunication(AudioDeviceInfo) - void clearDeviceForCommunication() - AudioDeviceInfo getDeviceForCommunication() A listener is also added for applications to monitor current communication device selection: - OnCommunicationDeviceChangedListener As well as listener registration and unregistration APIs: - addOnCommunicationDeviceChangedListener() - removeOnCommunicationDeviceChangedListener() Bug: 161358428 Test: make && atest AudioCommunicationDeviceTest Change-Id: I8028d842e4a8ca1abe0f87d03e3c5d57c46b9362 Merged-In: I8028d842e4a8ca1abe0f87d03e3c5d57c46b9362
2020-12-22Support set/clear/get preferred device for capture preset.Jiabin Huang
Support set/clear/get preferrd device for capture preset. The preferred device will be used for audio routing when it is availabled. The preferred device doesn't need to be present when setting. Bug: 160352965 Test: atest AudioServiceTest Test: atest AudioServiceHostTest Test: atest CarAudioZonesHelperTest Change-Id: Ib7aa142ad4c56a8138c7b440e8efbbf7a7ee38a6 Merged-In: Ib7aa142ad4c56a8138c7b440e8efbbf7a7ee38a6
2020-12-22Merge "Introduce device(s) role for strategy." am: 7f73ba815a am: c24c3af89dEric Laurent
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534429 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id31f00d038a87383f5a5ee6e4ba0d02baff0e31a
2020-12-22Merge "audio: modify media JNI and audio service test OWNERS" am: 70544c6a7b ↵Eric Laurent
am: 1f4fff0881 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535141 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6d56196500190868fbbbcbe395e04047a2be909e
2020-12-22Merge "Introduce device(s) role for strategy."Eric Laurent
2020-12-22audio: modify media JNI and audio service test OWNERSEric Laurent
Add OWNERS file to services/tests/servicestests/src/com/android/server/audio and add jmtrivi@google.com to media owners file. Test: N/A Change-Id: If446eb3f2de07ab1cb3e87715b964a9360ec684c
2020-12-21Introduce device(s) role for strategy.jiabin
Adding interface for set/remove/getDevicesRoleForStrategy. This will be used for setting device(s) role, such as preferred, for strategy. Set/remove/getPreferreDeviceForStrategy are reimplemented by calling the new interfaces. Test: atest AudioHostTest Test: atest AudioServiceHostTest Test: atest AudioServiceTest Test: atest audiopolicy_tests Bug: 160352965 Change-Id: I2ba02c6b50af80846a25010ead05c4ae364868de Merged-In: I2ba02c6b50af80846a25010ead05c4ae364868de
2020-12-21MediaRouterService binds services when necessary am: 56bc779553Kyunglyul Hyun
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13224013 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I657a04858f8a7e0d181bb8bf667d00f6e311e178
2020-12-21MediaRouterService binds services when necessaryKyunglyul Hyun
MediaRouterService maintained bindings to provider services once those are established. With this CL, it only binds services when there is a non-empty discovery preference set by a foreground app or an app is casting. This change may break output switcher, which enables transfer media of background apps. To alleviate that MediaRouter2Manager#startScan and #stopScan are added so that system UI can force the service bind to the services and find remote devices to cast. Bug: 169575701 Bug: 172920557 Test: manually and CTS Change-Id: I4a47fdb1c9fe05a04d26950485833c9cbfb91a69 (cherry picked from commit 9f889ca4e62044900004cb7ce4e85415d2b019e2) (cherry picked from commit 602b168f99b00c037191234a85190d845680aa64)
2020-12-18Merge "Add package name when initializing SoundPool." into rvc-qpr-devEric Laurent
2020-12-18TvProvider API standardization for ARIB and DVB TvProviderJunichiro.Homma
API standardization and customization for Digital Tuner TV Input support. (Channels.COLUMN_COLUMN_REMOTE_CONTROL_KEY_PRESET_NUMBER, Channels.COLUMN_SCRAMBLED, Channels.COLUMN_VIDEO_RESOLUTION, Channels.COLUMN_CHANNEL_LIST_ID, Channels.COLUMN_BROADCAST_GENRE) Bug: 158236748 Test: Manual - confirm tv.db Change-Id: Id0003b7312327de42a18352a7868eaaa3c1ebcc4
2020-12-18Merge "Add package name when initializing SoundPool." into rvc-qpr-dev-plus-aospEric Laurent
2020-12-18Add package name when initializing SoundPool.jiabin
The package name is useful for permission validation. Currently, package name is required when starting external vibration so that the vibrator service can verify if the app has the permission to start vibration. Bug: 175595599 Test: SoundPool tests in cts Test: play audio-coupled-haptic file using SoundPool. Change-Id: Ibfe414063a303118a5bb393d65ea5dc2323bf722 Merged-In: Ibfe414063a303118a5bb393d65ea5dc2323bf722 (cherry picked from commit de9005bab1751e23342bbc9f0f51213eea8885af)
2020-12-18Merge "MediaCodecInfo: do not alter performance points for 32-bit processes" ↵Wonsik Kim
am: 4f94f12cba am: 6289aa2374 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532514 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I96718eb4dd138cd8b6650cf9d85b08c79621c206
2020-12-17MediaCodecInfo: do not alter performance points for 32-bit processesWonsik Kim
Bug: 173488434 Test: atest CtsMediaTestCases:MediaCodecListTest Change-Id: Ie40557dc0401411cc51650ea42c0fd75f90c67ce
2020-12-17Merge "Expose MediaExtractor entry point to MediaMetrics" into rvc-qpr-devTreeHugger Robot
2020-12-17Add package name when initializing SoundPool.jiabin
The package name is useful for permission validation. Currently, package name is required when starting external vibration so that the vibrator service can verify if the app has the permission to start vibration. Bug: 175595599 Test: SoundPool tests in cts Test: play audio-coupled-haptic file using SoundPool. Change-Id: Ibfe414063a303118a5bb393d65ea5dc2323bf722 Merged-In: Ibfe414063a303118a5bb393d65ea5dc2323bf722 (cherry picked from commit de9005bab1751e23342bbc9f0f51213eea8885af)
2020-12-15Expose MediaExtractor entry point to MediaMetricsSantiago Seifert
Bug: 170386720 Test: atest CtsMediaV2TestCases:ExtractorTest$FunctionalityTest Change-Id: Id10861db464b88734c34c81db945b1a828f0bc2c Merged-In: Id10861db464b88734c34c81db945b1a828f0bc2c
2020-12-15Expose MediaExtractor entry point to MediaMetricsSantiago Seifert
Bug: 170386720 Test: atest CtsMediaV2TestCases:ExtractorTest$FunctionalityTest Change-Id: Id10861db464b88734c34c81db945b1a828f0bc2c Merged-In: Id10861db464b88734c34c81db945b1a828f0bc2c
2020-12-15MTP: Update language to comply with Android's inclusive language guidanceJames Wei
See https://source.android.com/setup/contribute/respectful-code for reference BUG=162536543 Change-Id: Ide3483e78ce66deb9bdda2a0d54feb8f70748832
2020-12-14Update Visualizer implementation after changes in AudioEffectMikhail Naganov
AudioEffect was fixed to remove a call to AudioEffect::set away from the constructor. Bug: 162323621 Bug: 174222126 Test: repro steps from the bug atest android.media.cts.VisualizerTest Change-Id: I90ac6e4fe0a1229758a98a63a3b7810de60469be Merged-In: I90ac6e4fe0a1229758a98a63a3b7810de60469be
2020-12-14Merge "MediaCodecInfo: limit resolution to 4K for 32-bit processes"Treehugger Robot
2020-12-11MediaCodecInfo: limit resolution to 4K for 32-bit processesWonsik Kim
Due to the limited virtual memory address space it is not practical to advertise support for more than 4K for 32-bit processes. Bug: 173488434 Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small Change-Id: Ibcd7f70f4efd8d696d831769bafe932207640830
2020-12-10Merge "[Mainline Migration] Migrate NetworkUtils" am: a086c295e7Serik Beketayev
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1498168 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc0a49e76f87a741f4410b53e9a40012e37fde36