Test: Kill media.extractor or mediaswcodec and observe logcat Bug: 130071409 Change-Id: Ie785642da99dfe4ff13e78d878817dae3de9f34agugelfrei
Pawin Vongmasa
5 years ago
parent
8263e3519b
commit
270dd6a1a6
@ -0,0 +1,80 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
//#define LOG_NDEBUG 0
|
||||||
|
#define LOG_TAG "MediaPlayerService-DeathNotifier"
|
||||||
|
#include <android-base/logging.h>
|
||||||
|
|
||||||
|
#include "DeathNotifier.h"
|
||||||
|
|
||||||
|
namespace android {
|
||||||
|
|
||||||
|
class DeathNotifier::DeathRecipient :
|
||||||
|
public IBinder::DeathRecipient,
|
||||||
|
public hardware::hidl_death_recipient {
|
||||||
|
public:
|
||||||
|
using Notify = DeathNotifier::Notify;
|
||||||
|
|
||||||
|
DeathRecipient(Notify const& notify): mNotify{notify} {
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void binderDied(wp<IBinder> const&) override {
|
||||||
|
mNotify();
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void serviceDied(uint64_t, wp<HBase> const&) override {
|
||||||
|
mNotify();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
Notify mNotify;
|
||||||
|
};
|
||||||
|
|
||||||
|
DeathNotifier::DeathNotifier(sp<IBinder> const& service, Notify const& notify)
|
||||||
|
: mService{std::in_place_index<1>, service},
|
||||||
|
mDeathRecipient{new DeathRecipient(notify)} {
|
||||||
|
service->linkToDeath(mDeathRecipient);
|
||||||
|
}
|
||||||
|
|
||||||
|
DeathNotifier::DeathNotifier(sp<HBase> const& service, Notify const& notify)
|
||||||
|
: mService{std::in_place_index<2>, service},
|
||||||
|
mDeathRecipient{new DeathRecipient(notify)} {
|
||||||
|
service->linkToDeath(mDeathRecipient, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
DeathNotifier::DeathNotifier(DeathNotifier&& other)
|
||||||
|
: mService{other.mService}, mDeathRecipient{other.mDeathRecipient} {
|
||||||
|
other.mService.emplace<0>();
|
||||||
|
other.mDeathRecipient = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
DeathNotifier::~DeathNotifier() {
|
||||||
|
switch (mService.index()) {
|
||||||
|
case 0:
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
std::get<1>(mService)->unlinkToDeath(mDeathRecipient);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
std::get<2>(mService)->unlinkToDeath(mDeathRecipient);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
CHECK(false) << "Corrupted service type during destruction.";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace android
|
||||||
|
|
||||||
@ -0,0 +1,48 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 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_MEDIASERVICE_DEATHNOTIFIER_H
|
||||||
|
#define ANDROID_MEDIASERVICE_DEATHNOTIFIER_H
|
||||||
|
|
||||||
|
#include <android/hidl/base/1.0/IBase.h>
|
||||||
|
#include <binder/Binder.h>
|
||||||
|
#include <hidl/HidlSupport.h>
|
||||||
|
|
||||||
|
#include <variant>
|
||||||
|
|
||||||
|
namespace android {
|
||||||
|
|
||||||
|
class DeathNotifier {
|
||||||
|
public:
|
||||||
|
using HBase = hidl::base::V1_0::IBase;
|
||||||
|
using Notify = std::function<void()>;
|
||||||
|
|
||||||
|
DeathNotifier(sp<IBinder> const& service, Notify const& notify);
|
||||||
|
DeathNotifier(sp<HBase> const& service, Notify const& notify);
|
||||||
|
DeathNotifier(DeathNotifier&& other);
|
||||||
|
~DeathNotifier();
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::variant<std::monostate, sp<IBinder>, sp<HBase>> mService;
|
||||||
|
|
||||||
|
class DeathRecipient;
|
||||||
|
sp<DeathRecipient> mDeathRecipient;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace android
|
||||||
|
|
||||||
|
#endif // ANDROID_MEDIASERVICE_DEATHNOTIFIER_H
|
||||||
|
|
||||||
@ -0,0 +1,59 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2019 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_MEDIASERVICE_DEATHRECIPIENT_H
|
||||||
|
#define ANDROID_MEDIASERVICE_DEATHRECIPIENT_H
|
||||||
|
|
||||||
|
#include <binder/binder.h>
|
||||||
|
#include <hidl/HidlSupport.h>
|
||||||
|
|
||||||
|
#include <variant>
|
||||||
|
|
||||||
|
class DeathNotifier :
|
||||||
|
public IBinder::DeathRecipient,
|
||||||
|
public ::android::hardware::hidl_death_recipient {
|
||||||
|
public:
|
||||||
|
using Service = std::variant<
|
||||||
|
sp<IBinder> const&,
|
||||||
|
sp<android::hidl::base::V1_0::IBase> const&>;
|
||||||
|
|
||||||
|
DeathNotifier(std::variant<sp<IBinder> const&,
|
||||||
|
const sp<IBinder>& service,
|
||||||
|
const sp<MediaPlayerBase>& listener,
|
||||||
|
int which,
|
||||||
|
const std::string& name);
|
||||||
|
DeathNotifier(
|
||||||
|
const sp<android::hidl::base::V1_0::IBase>& hService,
|
||||||
|
const sp<MediaPlayerBase>& listener,
|
||||||
|
int which,
|
||||||
|
const std::string& name);
|
||||||
|
virtual ~DeathNotifier() = default;
|
||||||
|
virtual void binderDied(const wp<IBinder>& who);
|
||||||
|
virtual void serviceDied(
|
||||||
|
uint64_t cookie,
|
||||||
|
const wp<::android::hidl::base::V1_0::IBase>& who);
|
||||||
|
void unlinkToDeath();
|
||||||
|
|
||||||
|
private:
|
||||||
|
sp<IBinder> mService;
|
||||||
|
sp<android::hidl::base::V1_0::IBase> mHService; // HIDL service
|
||||||
|
wp<MediaPlayerBase> mListener;
|
||||||
|
int mWhich;
|
||||||
|
std::string mName;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // ANDROID_MEDIASERVICE_DEATHRECIPIENT_H
|
||||||
|
|
||||||
Loading…
Reference in new issue