6652b3edcb
The ComposerService object wasn't watching for SurfaceFlinger restarts, which doesn't usually matter because the app framework restarts when SurfaceFlinger dies. However, mediaserver continues to run, which means its ComposerService object was trying to use a dead handle, and playback of DRM movies was failing. This adds a DeathRecipient listener and some logic to re-establish the SurfaceFlinger connection. Bug 6645813 Change-Id: I07581b881d3835601aa57d5358c8259d93bc4515
63 lines
1.9 KiB
C++
63 lines
1.9 KiB
C++
/*
|
|
* 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_PRIVATE_GUI_COMPOSER_SERVICE_H
|
|
#define ANDROID_PRIVATE_GUI_COMPOSER_SERVICE_H
|
|
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <utils/Singleton.h>
|
|
#include <utils/StrongPointer.h>
|
|
|
|
|
|
namespace android {
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
class IMemoryHeap;
|
|
class ISurfaceComposer;
|
|
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// This holds our connection to the composer service (i.e. SurfaceFlinger).
|
|
// If the remote side goes away, we will re-establish the connection.
|
|
// Users of this class should not retain the value from
|
|
// getComposerService() for an extended period.
|
|
//
|
|
// (It's not clear that using Singleton is useful here anymore.)
|
|
class ComposerService : public Singleton<ComposerService>
|
|
{
|
|
sp<ISurfaceComposer> mComposerService;
|
|
sp<IBinder::DeathRecipient> mDeathObserver;
|
|
Mutex mLock;
|
|
|
|
ComposerService();
|
|
void connectLocked();
|
|
void composerServiceDied();
|
|
friend class Singleton<ComposerService>;
|
|
public:
|
|
|
|
// Get a connection to the Composer Service. This will block until
|
|
// a connection is established.
|
|
static sp<ISurfaceComposer> getComposerService();
|
|
};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
}; // namespace android
|
|
|
|
#endif // ANDROID_PRIVATE_GUI_COMPOSER_SERVICE_H
|