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

am 3949f664: Merge "SurfaceFlinger: Fix null pointer exception"

Browse Source 
* commit '3949f664c71ad1269ee0c921d176e3b4484015cc':
  SurfaceFlinger: Fix null pointer exception
This commit is contained in:
Dan Stoza 2015-03-09 18:05:26 +00:00 committed by Android Git Automerger
commit b275b4dc3e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -620,7 +620,11 @@ status_t SurfaceFlinger::getDisplayStats(const sp<IBinder>& /* display */,
} }
int SurfaceFlinger::getActiveConfig(const sp<IBinder>& display) { int SurfaceFlinger::getActiveConfig(const sp<IBinder>& display) {
return getDisplayDevice(display)->getActiveConfig(); sp<DisplayDevice> device(getDisplayDevice(display));
if (device != NULL) {
return device->getActiveConfig();
}
return BAD_VALUE;
} }
void SurfaceFlinger::setActiveConfigInternal(const sp<DisplayDevice>& hw, int mode) { void SurfaceFlinger::setActiveConfigInternal(const sp<DisplayDevice>& hw, int mode) {