ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 9cc84950: Merge "Don\'t check if this == NULL." 

* commit '9cc849500df0bba42d3ed19b90c38ff1dffd2262':
  Don't check if this == NULL.
This commit is contained in:
Dan Albert 2014-10-15 22:52:43 +00:00 committed by Android Git Automerger
parent 0adea3b792 9cc849500d
commit 759115cd6d
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/binder/IInterface.cpp
View File

@ -29,12 +29,12 @@ IInterface::~IInterface() {
sp<IBinder> IInterface::asBinder()
{
return this ? onAsBinder() : NULL;
return onAsBinder();
}
sp<const IBinder> IInterface::asBinder() const
{
return this ? const_cast<IInterface*>(this)->onAsBinder() : NULL;
return const_cast<IInterface*>(this)->onAsBinder();
}
// ---------------------------------------------------------------------------

2
libs/gui/LayerState.cpp
View File

@ -75,7 +75,7 @@ status_t ComposerState::read(const Parcel& input) {
status_t DisplayState::write(Parcel& output) const {
output.writeStrongBinder(token);
output.writeStrongBinder(surface->asBinder());
output.writeStrongBinder(surface != NULL ? surface->asBinder() : NULL);
output.writeInt32(what);
output.writeInt32(layerStack);
output.writeInt32(orientation);

6
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -1274,7 +1274,11 @@ void SurfaceFlinger::handleTransactionLocked(uint32_t transactionFlags)
// this display is in both lists. see if something changed.
const DisplayDeviceState& state(curr[j]);
const wp<IBinder>& display(curr.keyAt(j));
if (state.surface->asBinder() != draw[i].surface->asBinder()) {
const sp<IBinder> state_binder =
state.surface != NULL ? state.surface->asBinder() : NULL;
const sp<IBinder> draw_binder =
draw[i].surface != NULL ? draw[i].surface->asBinder() : NULL;
if (state_binder != draw_binder) {
// changing the surface is like destroying and
// recreating the DisplayDevice, so we just remove it
// from the drawing state, so that it get re-added