Merge "Update calls to IInterface::asBinder()" (e11d81b3) · Commits · e / os / android_system_core

healthd/BatteryPropertiesRegistrar.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -48,13 +48,13 @@ void BatteryPropertiesRegistrar::registerListener(const sp<IBatteryPropertiesLis
		Mutex::Autolock _l(mRegistrationLock);
		// check whether this is a duplicate
		for (size_t i = 0; i < mListeners.size(); i++) {
		if (mListeners[i]->asBinder() == listener->asBinder()) {
		if (IInterface::asBinder(mListeners[i]) == IInterface::asBinder(listener)) {
		return;
		}
		}

		mListeners.add(listener);
		listener->asBinder()->linkToDeath(this);
		IInterface::asBinder(listener)->linkToDeath(this);
		}
		healthd_battery_update();
		}
		@@ -64,8 +64,8 @@ void BatteryPropertiesRegistrar::unregisterListener(const sp<IBatteryPropertiesL
		return;
		Mutex::Autolock _l(mRegistrationLock);
		for (size_t i = 0; i < mListeners.size(); i++) {
		if (mListeners[i]->asBinder() == listener->asBinder()) {
		mListeners[i]->asBinder()->unlinkToDeath(this);
		if (IInterface::asBinder(mListeners[i]) == IInterface::asBinder(listener)) {
		IInterface::asBinder(mListeners[i])->unlinkToDeath(this);
		mListeners.removeAt(i);
		break;
		}
		@@ -93,7 +93,7 @@ void BatteryPropertiesRegistrar::binderDied(const wp<IBinder>& who) {
		Mutex::Autolock _l(mRegistrationLock);

		for (size_t i = 0; i < mListeners.size(); i++) {
		if (mListeners[i]->asBinder() == who) {
		if (IInterface::asBinder(mListeners[i]) == who) {
		mListeners.removeAt(i);
		break;
		}