Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dbdc40e authored by Eric Laurent's avatar Eric Laurent
Browse files

Fix issue 4604090: notification sound interrupted. 

The problem is that the audio HAL fails to acquire the wake lock when playing the notification.
This is because of a change that removed the mediaserver process form the system group for honeycomb.

The fix consists in requesting the wake lock from PowerManagerService when AudioFlinger mixer
wakes up.

A consequence of this change is that audio HALs or pcm drivers do not have to hold wake locks
anymore as in the past.

Change-Id: I4fb3cc84816c9c408ab7fec75886baf801e1ecb5
parent 6c454c32

core/java/android/os/IPowerManager.aidl

+3 −0
Original line number Diff line number Diff line
@@ -20,12 +20,15 @@ package android.os; 
import android.os.WorkSource;



/** @hide */



interface IPowerManager

{

    // WARNING: changes in acquireWakeLock() signature must be reflected in IPowerManager.cpp/h

    void acquireWakeLock(int flags, IBinder lock, String tag, in WorkSource ws);

    void updateWakeLockWorkSource(IBinder lock, in WorkSource ws);

    void goToSleep(long time);

    void goToSleepWithReason(long time, int reason);

    // WARNING: changes in releaseWakeLock() signature must be reflected in IPowerManager.cpp/h

    void releaseWakeLock(IBinder lock, int flags);

    void userActivity(long when, boolean noChangeLights);

    void userActivityWithForce(long when, boolean noChangeLights, boolean force);

data/etc/platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ 
    <assign-permission name="android.permission.MODIFY_AUDIO_SETTINGS" uid="media" />

    <assign-permission name="android.permission.ACCESS_DRM" uid="media" />

    <assign-permission name="android.permission.ACCESS_SURFACE_FLINGER" uid="media" />

    <assign-permission name="android.permission.WAKE_LOCK" uid="media" />



    <assign-permission name="android.permission.ACCESS_SURFACE_FLINGER" uid="graphics" />

include/powermanager/IPowerManager.h

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_IPOWERMANAGER_H

#define ANDROID_IPOWERMANAGER_H



#include <utils/Errors.h>

#include <binder/IInterface.h>



namespace android {



// ----------------------------------------------------------------------------



// must be kept in sync with interface defined in IPowerManager.aidl

class IPowerManager : public IInterface

{

public:

    DECLARE_META_INTERFACE(PowerManager);



    virtual status_t acquireWakeLock(int flags, const sp<IBinder>& lock, const String16& tag) = 0;

    virtual status_t releaseWakeLock(const sp<IBinder>& lock, int flags) = 0;

};



// ----------------------------------------------------------------------------



}; // namespace android



#endif // ANDROID_IPOWERMANAGER_H

include/powermanager/PowerManager.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_POWERMANAGER_H

#define ANDROID_POWERMANAGER_H



namespace android {



// must be kept in sync with definitions in PowerManager.java

enum {

    POWERMANAGER_PARTIAL_WAKE_LOCK = 1, // equals PowerManager.PARTIAL_WAKE_LOCK constant

};



}; // namespace android



#endif // ANDROID_POWERMANAGER_H

services/audioflinger/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libhardware \

    libhardware_legacy \

    libeffects \

    libdl

    libdl \

    libpowermanager



LOCAL_STATIC_LIBRARIES := \

    libcpustats \