drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
814,109 Commits 1 Branch 0 Tags
Commit Graph

19468 Commits

Author SHA1 Message Date
Jean-Michel Trivi
c1370378c7 Merge "AudioSystem: fix "keep in sync" comments" 2023-03-29 21:06:22 +00:00
Atneya Nair
3445c76d33 Merge "SoundTrigger OWNERS cleanup" 2023-03-29 17:16:20 +00:00
Jean-Michel Trivi
43fde9a3af AudioSystem: fix "keep in sync" comments 
Fix "keep in sync" comments for definitions that should match
those in system/media/audio/include/system/audio-hal-enums.h

Test: none, comment update
Change-Id: I150d1262b1cb1d204eb1ff55a7f05f5f65f81680
 2023-03-29 09:43:31 -07:00
Atneya Nair
59d53fd3dd Add media ownership for atneya 
Change-Id: I24b8fad3c1bfe735a32678ff842bc2132d16af12
 2023-03-29 05:54:12 +00:00
Atneya Nair
72554e3941 SoundTrigger OWNERS cleanup 
- Move SoundTrigger owners to reference authoritative file
- Add SoundTrigger ownership to top level services/voiceinteraction directory
to simplify maintenance.

Test: Compiles
Fixes: 275435310
Change-Id: I3fc8e98ef017f93f7208dc2fb5073beda6dcfb18
 2023-03-27 19:34:51 -07:00
Ray Essick
f715c61542 Merge "Use a ExifInterface ctor with a file descriptor as a parameter" 2023-03-20 22:50:05 +00:00
David Zhao
6846c4957d Merge "Add qingxun to TV framework owners" 2023-03-16 23:40:33 +00:00
Xin Li
487d87cadc Merge "Merge Android 13 QPR2" 2023-03-14 21:40:43 +00:00
Ray Essick
7ca9c3a6c8 Merge "ExifInterface: Use FileDescriptors whenever we can." 2023-03-14 15:29:01 +00:00
Martijn Coenen
e69a12f356 ExifInterface: Use FileDescriptors whenever we can. 
This avoids a complex cyclic dependency between MediaProvider,
mediacodec and media.extractor.

Bug: 199822700
Bug: 260950919
Test: manual
Change-Id: I8863c539c7bded77fef24dfcedf28bdc59568940
 2023-03-14 11:36:07 +00:00
David Zhao
b603e6e9eb Add qingxun to TV framework owners 
Test: mmm
Change-Id: Ib02053429ef0f58c79ddbe0a3b7adfd0b2ccaee9
 2023-03-13 17:10:10 -07:00
Treehugger Robot
70182fc006 Merge "CAS : Add missing converstion of message data" am: 0201f12911 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2483118

Change-Id: Ic27f70a081540da404fc656979498e6c084766da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 23:13:46 +00:00
Treehugger Robot
0201f12911 Merge "CAS : Add missing converstion of message data" 2023-03-13 23:05:56 +00:00
Dichen Zhang
a31af1d435 Merge "Fix javadoc error for MediaFormat.KEY_BITRATE_MODE" am: b7c18f231a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2480317

Change-Id: Ie2c5dcc792aa21e402e7632ba1c6f7390a568003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 22:58:20 +00:00
Hyoungho Choi
e106aa909b Use a ExifInterface ctor with a file descriptor as a parameter 
To avoid a binder circular dependency, ExifInterface is changed to use
a file descriptor for getting HEIF attributes (when available).

Bug: 199822700
Test: manual
Change-Id: I1b0762fd91f89bfb739b47467a685149309dd157
 2023-03-13 17:00:45 -05:00
Shraddha Basantwani
a31a6e087c CAS : Add missing converstion of message data 
Test: atest MediaCasTest#testClearKeyApis
Bug: 269691993
Change-Id: Id04345a5aeebeb140b2f6bfe3166dc1ffb3558e6
 2023-03-13 15:29:57 +05:30
Dichen Zhang
e97b05d090 Fix javadoc error for MediaFormat.KEY_BITRATE_MODE 
Change-Id: I0d95ba29ce1cbdb697df9a0714930c752971eb4a
Test: build
 2023-03-09 20:31:02 +00:00
Naomi Musgrave
decd0f13cb Merge "[MediaProjection] Include myself in OWNERS" am: 917ae5dcf0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2464972

Change-Id: I041821874a03cdb3d1f78b90df3d6c05c2efee83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-02 19:35:23 +00:00
Naomi Musgrave
002346004e [MediaProjection] Include myself in OWNERS 
Change-Id: I72b11d6a1f180c44565b50f3f4e8d2673fde3fec
 2023-03-02 11:44:43 +00:00
Robert Shih
5a297d5d39 Merge "Fix MediaDrm.PlaybackComponent#setLogSessionId doc" am: a20d36c086 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2000331

Change-Id: I325b058a8aeb867ef27abe0fc78480bbe393128a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-24 08:40:49 +00:00
Robert Shih
a20d36c086 Merge "Fix MediaDrm.PlaybackComponent#setLogSessionId doc" 2023-02-24 07:01:19 +00:00
Ian Baker
a44c29cd16 Merge "RingtoneManager#setActualDefaultRingtone() open OutputStream of cacheUri with "wt" mode" am: f922e9fa40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2447583

Change-Id: I2fb1029ee017bb51b22644bb9298aa9ffbd9981d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-22 11:47:44 +00:00
zhangjiaqing
111ad95788 RingtoneManager#setActualDefaultRingtone() open OutputStream of cacheUri with "wt" mode 
the default mode is "w",if the cache file is not deleted successfully before openOutputStream and the size of new ringtone is smaller than old rongtone,the cache file will be a mixture of old and new ringtone.

Bug: 263074833

Change-Id: Ib7a0bf5e2a9f695aa4701c91c0b79c6bce2d76f1
 2023-02-21 17:54:57 +08:00
Mikhail Naganov
ad0a80281d Merge "audio: Use auto-generated MicrophoneInfoFw class" am: b28d0c3ed6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2438892

Change-Id: I5d9c068ef0ff3f76b7980b06f34dceacbe8f4b56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-16 16:47:12 +00:00
Mikhail Naganov
b28d0c3ed6 Merge "audio: Use auto-generated MicrophoneInfoFw class" 2023-02-16 15:39:31 +00:00
Treehugger Robot
a5cfe59a5d Merge "Adds API AudioManager#setLeAudioSuspended" am: a05aa12869 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2439772

Change-Id: Ic7b6ad59560f024a4ede8f11cf11d2bbd84613df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-16 03:16:14 +00:00
Treehugger Robot
3e5397d945 Merge "Add function for getting supported audio format for LE Audio Broadcast" am: 433eceabff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2428912

Change-Id: Icb75b22d15fca3a4595f2fec17c04b68e3d8df63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-16 03:14:08 +00:00
Andy Hung
452cd4a7e9 Merge "Report AC-4 decoder profile and level" am: e091cebf12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2389989

Change-Id: I5cbf9727a4a6eec89970b2309129e9fe26733cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-16 03:09:04 +00:00
Treehugger Robot
a05aa12869 Merge "Adds API AudioManager#setLeAudioSuspended" 2023-02-16 02:49:01 +00:00
Treehugger Robot
433eceabff Merge "Add function for getting supported audio format for LE Audio Broadcast" 2023-02-16 02:45:47 +00:00
Andy Hung
e091cebf12 Merge "Report AC-4 decoder profile and level" 2023-02-16 02:44:47 +00:00
Rahul Sabnis
ee9fc5a124 Adds API AudioManager#setLeAudioSuspended 
Bug: 257881495
Test: Manual
Merged-In: Ib07d54ffb6fc34ea2f5985115fde132ab19c27c2
Change-Id: Ib07d54ffb6fc34ea2f5985115fde132ab19c27c2
 2023-02-15 17:41:40 -08:00
Mikhail Naganov
3aa51da158 audio: Use auto-generated MicrophoneInfoFw class 
Replace use of manually written MicrophoneInfo class
with MicrophoneInfoFw which is generated automatically
from the AIDL definition.

Bug: 263964254
Test: m
Change-Id: I61e842ad0dbad970c1b6ddfe6c72fcda83b5843c
Merged-In: I61e842ad0dbad970c1b6ddfe6c72fcda83b5843c
 2023-02-15 10:29:31 -08:00
Treehugger Robot
e793123762 Merge "BluetoothProfileConnectionInfo: javadoc update for LE factory methods" am: f454022730 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2435838

Change-Id: I96d9c726b95aa06a65f12d14ebe36a577db1b6cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-15 06:23:35 +00:00
Jean-Michel Trivi
71f78cf333 BluetoothProfileConnectionInfo: javadoc update for LE factory methods 
Update the javadoc of createLeAudioInfo and createLeAudioOutputInfo
to clarify when one is to be used over the other.

Bug: 243514151
Test: javadoc
Change-Id: Ice8bb4ff69c5ba53edb2a0bc9459f2b77cc67ebb
Merged-In: Ice8bb4ff69c5ba53edb2a0bc9459f2b77cc67ebb
 2023-02-15 04:48:09 +00:00
ybai
2a2cb440b7 Report AC-4 decoder profile and level 
Bug: 266537650

Change-Id: I259870a236af1d504d401d009b332e490423834a
 2023-02-15 11:20:16 +08:00
Patty Huang
32029978f8 Add function for getting supported audio format for LE Audio Broadcast 
* Update function getHwOffloadFormatsSupportedForBluetoothMedia(),
   when the input device is AUDIO_DEVICE_OUT_BLE_HEADSET return
   the supported audio format for LE Audio unicast device
 * Update function getHwOffloadFormatsSupportedForBluetoothMedia()
   for getting the supported format of LE Audio broadcast

Bug: 242472419
Test: atest AudioManagerTest
Merged-In: I16de155597178fc8fdcb249e8625b8f78b334286
Change-Id: I16de155597178fc8fdcb249e8625b8f78b334286
 2023-02-14 11:54:16 +08: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
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
Yixiao Luo
249b09ac23 Merge "Add constants for supplementary audio placement" am: f5ac336b1d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2380848

Change-Id: I190d3ed1395486c5679ffd16f9620b3c84231cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-28 06:47:44 +00:00
Yixiao Luo
9a4ba4d624 Add constants for supplementary audio placement 
bug: 230158637
test: mmm
Change-Id: Iebde7dcb0ecfcc47c771a65aa633d2fbe1ee7ba3
 2023-01-27 16:46:30 -08:00
Kyle Zhang
8b8a0a5f36 Merge "Check NULL for Drm object" am: 849320e814 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2401079

Change-Id: I1db05b3d7941b0d8296025cadc2d7dd2dc17549b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-27 20:31:32 +00:00
Yixiao Luo
8efed016b9 Merge "Add API to register AttributionSource of TV App to TIS" am: 9a2db08346 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2356827

Change-Id: I5d0997ff602582794bca39ef9c6ec53e0999da92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-27 20:07:36 +00:00
Kyle Zhang
849320e814 Merge "Check NULL for Drm object" 2023-01-26 19:16:46 +00:00
Yixiao Luo
9a2db08346 Merge "Add API to register AttributionSource of TV App to TIS" 2023-01-26 00:21:50 +00:00
Treehugger Robot
6aabfa98da Merge "Add YCBCR_P010 in switch content in ImageUtil getNumPlanes." am: 9c1b97152e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2401592

Change-Id: Idf1614949814d0b773cadc267f6f96aca0eba233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 03:47:45 +00:00