/
0001-hybris-AudioService-is-disabled-in-hybris-adaptation.patch
38 lines (32 loc) · 1.6 KB
/
0001-hybris-AudioService-is-disabled-in-hybris-adaptation.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Simonas Leleiva <simonas.leleiva@meramo.co.uk>
Date: Sun, 30 Oct 2016 14:07:11 +0000
Subject: [PATCH] (hybris) AudioService is disabled in hybris adaptations
Without this patch, camera is waiting for AudioService indefinitely
Change-Id: Id572746cc77c8d26e3a8e7fc1dc05b17ac282ed4
Signed-off-by: Simonas Leleiva <simonas.leleiva@jollamobile.com>
---
services/camera/libcameraservice/CameraService.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 550be4a7d5d95d7485eb669182d7a6bb6c42c12f..92191de11b0f8450d7155ed39f939c367ab066df 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -2047,10 +2047,11 @@ void CameraService::increaseSoundRef() {
mSoundRef++;
}
-void CameraService::loadSoundLocked(sound_kind kind) {
+void CameraService::loadSoundLocked(sound_kind /*kind*/) {
ATRACE_CALL();
LOG1("CameraService::loadSoundLocked ref=%d", mSoundRef);
+/*
if (SOUND_SHUTTER == kind && mSoundPlayer[SOUND_SHUTTER] == NULL) {
mSoundPlayer[SOUND_SHUTTER] = newMediaPlayer("/product/media/audio/ui/camera_click.ogg");
if (mSoundPlayer[SOUND_SHUTTER] == nullptr) {
@@ -2068,6 +2069,7 @@ void CameraService::loadSoundLocked(sound_kind kind) {
mSoundPlayer[SOUND_RECORDING_STOP] = newMediaPlayer("/system/media/audio/ui/VideoStop.ogg");
}
}
+*/
}
void CameraService::decreaseSoundRef() {