Merge "audioflinger: Fix crash in EffectChain::dump"
diff --git a/radio/IRadio.cpp b/radio/IRadio.cpp
index 5bbe7cb..d475805 100644
--- a/radio/IRadio.cpp
+++ b/radio/IRadio.cpp
@@ -300,14 +300,12 @@
case GET_PROGRAM_INFORMATION: {
CHECK_INTERFACE(IRadio, data, reply);
struct radio_program_info info;
- status_t status;
- status = radio_metadata_allocate(&info.metadata, 0, 0);
+ status_t status = radio_metadata_allocate(&info.metadata, 0, 0);
if (status != NO_ERROR) {
return status;
}
status = getProgramInformation(&info);
-
reply->writeInt32(status);
if (status == NO_ERROR) {
reply->write(&info, sizeof(struct radio_program_info));
diff --git a/services/mediacodec/minijail/seccomp_policy/mediacodec-seccomp-arm.policy b/services/mediacodec/minijail/seccomp_policy/mediacodec-seccomp-arm.policy
index 9a0894d..b7603bc 100644
--- a/services/mediacodec/minijail/seccomp_policy/mediacodec-seccomp-arm.policy
+++ b/services/mediacodec/minijail/seccomp_policy/mediacodec-seccomp-arm.policy
@@ -43,6 +43,7 @@
sched_yield: 1
nanosleep: 1
lseek: 1
+_llseek: 1
sched_get_priority_max: 1
sched_get_priority_min: 1
statfs64: 1