Automerger Merge Worker
05c49e907f
Merge "CameraService: hold onto SensorPrivacyManager" am: 733c728752
am: 9279fa954a
am: 16dd56fa2d
...
Change-Id: Ibe7d0626f3c93cabc933ae1b8fbc678c3052b19e
5 years ago
TreeHugger Robot
0b890e627d
Merge "Merge commit '29622fe971325dd6929f2f3a4fe2c7fcf736c03c' into manual_merge_29622fe971325dd6929f2f3a4fe2c7fcf736c03c"
5 years ago
Glenn Kasten
ae42acb34d
Merge "Add micro-benchmark for media metrics"
5 years ago
Automerger Merge Worker
16dd56fa2d
Merge "CameraService: hold onto SensorPrivacyManager" am: 733c728752
am: 9279fa954a
...
Change-Id: I2930c10685eef466491626e7cfed1fbda8720081
5 years ago
Andy Hung
cfaa13af32
Merge commit '29622fe971325dd6929f2f3a4fe2c7fcf736c03c' into manual_merge_29622fe971325dd6929f2f3a4fe2c7fcf736c03c
...
Manual merge by recursive strategy with no conflicts (automerger failed).
Test: build and sanity
Bug: None
Change-Id: I9e2d9466d26fde80a95f0c7a2ac336c1a23c3bc5
5 years ago
Automerger Merge Worker
9279fa954a
Merge "CameraService: hold onto SensorPrivacyManager" am: 733c728752
...
Change-Id: Ibdf8f29d1ede305d4fc7f7b18ee5f37c25a85162
5 years ago
Steven Moreland
733c728752
Merge "CameraService: hold onto SensorPrivacyManager"
5 years ago
Automerger Merge Worker
29622fe971
Merge "libeffects: Rename .c files at lvm/lib to .cpp" am: 70ee7b5eb4
am: e32e810842
...
Change-Id: I4f2130c74d9bbd827c996f5dd6bc4ff336aefbf0
5 years ago
Automerger Merge Worker
e32e810842
Merge "libeffects: Rename .c files at lvm/lib to .cpp" am: 70ee7b5eb4
...
Change-Id: I92a7609eced34cc21e71ec463d992e708a126565
5 years ago
Glenn Kasten
d39f41fb3a
Add micro-benchmark for media metrics
...
Test: this is it
Change-Id: I3762223eb5ca67757debba02245a2ad87dd7e75e
5 years ago
Andy Hung
70ee7b5eb4
Merge "libeffects: Rename .c files at lvm/lib to .cpp"
5 years ago
Saketh Sathuvalli
2b7eb6b897
libeffects: Rename .c files at lvm/lib to .cpp
...
Removed extern "C" declaration in header files. Since all
files at lvm/lib are .cpp and all function names are unique,
extern "C" is no longer required.
Note: Build errors due to renaming of files to .cpp
are taken care in this patch.
Test: android.media.cts.AudioEffectTest
Test: android.media.cts.AudioPreProcessingTest
Test: android.media.cts.BassBoostTest
Test: android.media.cts.EnvReverbTest
Test: android.media.cts.EqualizerTest
Test: android.media.cts.LoudnessEnhancerTest
Test: android.media.cts.PresetReverbTest
Test: android.media.cts.VirtualizerTest
Test: android.media.cts.VisualizerTest
Test: Play Music offload / non-offload
Test: Tested using standalone application
Bug: 129491957
Change-Id: I7033146c21681372a212d507f959ab02568b7538
5 years ago
Marco Nelissen
2496ffbc45
Merge "Implement name() and flags() in IMediaExtractor"
5 years ago
TreeHugger Robot
a170e61fb4
Merge "aaudio: less alarming message for MMAP"
5 years ago
TreeHugger Robot
f1de76e5d1
Merge "aaudio: add checks for Binder return codes"
5 years ago
Wonsik Kim
694901763d
Merge "stagefright: do not attempt to read from secure output buffer"
5 years ago
Phil Burk
ea5c49e174
aaudio: less alarming message for MMAP
...
Bug: 80192689
Test: adb logcat | grep MMAP
Test: run OboeTester, TEST OUTPUT, perfMode: None, OPEN
Test: should see "MMAP not available because
Test: AAUDIO_PERFORMANCE_MODE_LOW_LATENCY not used"
Change-Id: I164902abcfafb53a34685b9ef9ec5346842e1dda
5 years ago
Phil Burk
25532c7698
aaudio: add checks for Binder return codes
...
Binder code was calling readInt32() but not checking the return code.
Bug: 139473816
Test: see bug for proof of concept
Test: atest CtsNativeMediaAAudioTestCases
Change-Id: I9246382b657c2a1213d27c66fc006578553f7b1e
5 years ago
TreeHugger Robot
c1c884dd5f
Merge "Fix ACameraMetadata_fromCameraMetadata crash."
5 years ago
Steven Moreland
3cf67173b1
CameraService: hold onto SensorPrivacyManager
...
unlinkToDeath is no longer required, (this change in behavior is to
avoid leaks) so holding onto the service here (still calling
unlinkToDeath to avoid a log, but may for instance remove all
unlinkToDeath calls in the future).
Bug: 145692765
Test: boot, see linkToDeath maintained
Change-Id: Ib74ab470580643ff61fc684fdd4e16d5e38389af
5 years ago
Automerger Merge Worker
d8de90a7c1
Enable coverage for libmediandk am: 6e51a2630a
am: 4cb250e101
am: c68bd1bfa9
...
Change-Id: Ib73f080ee52407603913d29076005777ebaf0829
5 years ago
Automerger Merge Worker
c68bd1bfa9
Enable coverage for libmediandk am: 6e51a2630a
am: 4cb250e101
...
Change-Id: I8b30ae02e6cdf9005b0823e208a426e64d4e54d3
5 years ago
Wonsik Kim
922bb104df
stagefright: do not attempt to read from secure output buffer
...
Bug: 143193031
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: Ie5eca8fc954e1b8527b70c04bfc326089720e022
5 years ago
Automerger Merge Worker
4cb250e101
Enable coverage for libmediandk am: 6e51a2630a
...
Change-Id: I8b6ae168f9cc73e931ea6e04abd427be451ef101
5 years ago
Automerger Merge Worker
5171e0c6af
[automerger skipped] Merge "[AudioPolicyService] Add creation of DeviceEffects" am: 04feef633b
am: e2e2214e4c
am: 45016b3edb
-s ours
...
am skip reason: Change-Id I249d9ef112a8a8c7947a099e5937bf0a8b05014c with SHA-1 e8e0e7a52b
is in history
Change-Id: I8960aa2744892e8c412c576c15102b47498e8b5d
5 years ago
Automerger Merge Worker
45016b3edb
Merge "[AudioPolicyService] Add creation of DeviceEffects" am: 04feef633b
am: e2e2214e4c
...
Change-Id: Ibb9e5bb4c3f248b08d8ee419ecffd2116cf0034a
5 years ago
Eric Laurent
e2e2214e4c
Merge "[AudioPolicyService] Add creation of DeviceEffects"
...
am: 04feef633b
Change-Id: Ib407e322c1a229322139babd0e9ba667e9d7e66e
5 years ago
Eric Laurent
04feef633b
Merge "[AudioPolicyService] Add creation of DeviceEffects"
5 years ago
Jiawen Chen
0da716bedb
Fix ACameraMetadata_fromCameraMetadata crash.
...
Root cause was that jclass instances acquired from JNIEnv::FindClass are
not pinned and become invalidated due to Java garbage collection. Adding
a new global ref pins the pointer.
FIXED=148174094
Test: atest android.hardware.camera2.cts.CameraManagerTest#testCameraCharacteristicsNdkFromSdk android.hardware.camera2.cts.CaptureResultTest#testCameraCaptureResultAllKeys
Test: atest NativeCameraDeviceTest NativeCameraManagerTest NativeImageReaderTest NativeStillCaptureTest
Change-Id: Id0601b9c01e1a58485e3b039a87a5cf56a19e0af
5 years ago
Glenn Kasten
b302ba7ff3
Merge "Make <media/MediaMetrics.h> safe to use directly"
5 years ago
Automerger Merge Worker
6d7fc8a5c9
Merge "MediaTesting: Add Mpeg4 H263 Decoder Test" am: 5bebb2dfa9
am: 27bd07bd5a
am: 7390832422
...
Change-Id: Ib751b1b883f29d15b6c38164606daa9a9a265c82
5 years ago
Automerger Merge Worker
7390832422
Merge "MediaTesting: Add Mpeg4 H263 Decoder Test" am: 5bebb2dfa9
am: 27bd07bd5a
...
Change-Id: Ib43be3eb9ffcc4bdd50ff9fcb45dae0d097b5d3f
5 years ago
Ray Essick
27bd07bd5a
Merge "MediaTesting: Add Mpeg4 H263 Decoder Test"
...
am: 5bebb2dfa9
Change-Id: Ib2cda3fa7c5b5bbc2d2bdb3c6ff151b7e1578e46
5 years ago
Ray Essick
5bebb2dfa9
Merge "MediaTesting: Add Mpeg4 H263 Decoder Test"
5 years ago
Automerger Merge Worker
2ac7f2b51f
Merge changes from topic "apply-aosp-1209307-and-following" am: 9b7d89970a
am: a6c9490e7f
am: fb3fb333a2
...
Change-Id: I3449759cd9ebae747f733388497ffbb11954f2e1
5 years ago
Automerger Merge Worker
98ef43d923
Sync AUDIO_FLAG_XXX to/from string utility with enumeration am: 9002e44513
am: 6b70e2de0f
am: 456e875ae2
...
Change-Id: I8aa6bda1428814853a3cfe0b8585264dbaef5d0d
5 years ago
Automerger Merge Worker
83af377e26
[AudioPolicy][EngineConfigurable] Cleanup warn / error logs am: 376740fd7f
am: f11192946b
am: 621125729d
...
Change-Id: I334fdda4df6039d006ce78e52a7428911e72bcd1
5 years ago
Automerger Merge Worker
64d9681c32
[AudioPolicy][EngineConfigurable] Fix new assistant stream regression am: 15811d35d5
am: 41f9d98b4b
am: 7e82e73a3f
...
Change-Id: Idd15eaf8c79bfa8e07cb89f9463e784b6778dcf9
5 years ago
Automerger Merge Worker
8f07bb4230
[AudioPolicy][EngineConfigurable] Prevent regression on audio-base.h change am: 8b04892102
am: 863246923a
am: b7b128f068
...
Change-Id: I983043983cfb6ffcc3acd5dcc8d20156953841dd
5 years ago
Automerger Merge Worker
fb3fb333a2
Merge changes from topic "apply-aosp-1209307-and-following" am: 9b7d89970a
am: a6c9490e7f
...
Change-Id: I6ebb7201de5c606459859e5f79155f269e21c783
5 years ago
Automerger Merge Worker
456e875ae2
Sync AUDIO_FLAG_XXX to/from string utility with enumeration am: 9002e44513
am: 6b70e2de0f
...
Change-Id: I6be43482c01f2cdb266c47dff5c0f1dc8a79200e
5 years ago
Automerger Merge Worker
621125729d
[AudioPolicy][EngineConfigurable] Cleanup warn / error logs am: 376740fd7f
am: f11192946b
...
Change-Id: I3881341b0381d9dbceb9d3b87ba33499e8f53ac0
5 years ago
Automerger Merge Worker
7e82e73a3f
[AudioPolicy][EngineConfigurable] Fix new assistant stream regression am: 15811d35d5
am: 41f9d98b4b
...
Change-Id: Ia3ac2036b9b00fc4f84494bd3f851497b16ca101
5 years ago
Automerger Merge Worker
b7b128f068
[AudioPolicy][EngineConfigurable] Prevent regression on audio-base.h change am: 8b04892102
am: 863246923a
...
Change-Id: I3696d8197b8fb6cbd53331b6ddafadd13c20a16c
5 years ago
François Gaffie
a6c9490e7f
Merge changes from topic "apply-aosp-1209307-and-following"
...
am: 9b7d89970a
Change-Id: I5c8fb6ee0b7121690d76bbc70d373529d5df639a
5 years ago
Franois Gaffie
6b70e2de0f
Sync AUDIO_FLAG_XXX to/from string utility with enumeration
...
am: 9002e44513
Change-Id: Ifecd8ce0e05eefe163c99b7502fea2b66e88d1a9
5 years ago
Automerger Merge Worker
6419adce11
[automerger skipped] Merge "[audioeffect] add support of device effect in config parser" am: 5aa86cdf13
am: 32efde406a
am: 3e7f2acafc
-s ours
...
am skip reason: Change-Id I2c75b4bf6a4346362044696feabb35822c860efa with SHA-1 1204baa633
is in history
Change-Id: I674f145d25b24764296a1ec0a1d38ea5c9d7508f
5 years ago
Franois Gaffie
f11192946b
[AudioPolicy][EngineConfigurable] Cleanup warn / error logs
...
am: 376740fd7f
Change-Id: I724aadd827599c962657fbcb84ccede30b817558
5 years ago
Francois Gaffie
41f9d98b4b
[AudioPolicy][EngineConfigurable] Fix new assistant stream regression
...
am: 15811d35d5
Change-Id: Ie7c65c0fea28eac2d9ad06f2c7c854a03e26fc81
5 years ago
Francois Gaffie
863246923a
[AudioPolicy][EngineConfigurable] Prevent regression on audio-base.h change
...
am: 8b04892102
Change-Id: I96d459bb50c6fb59b50b28aa88be2c3f215de5f3
5 years ago