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

SurfaceFlinger: Fix null pointer exception

Browse Source 
Fixes a null pointer exception in getActiveConfig

Bug: 19416124
Change-Id: I45a01f67affb63a348866ce42a6013c5eb71fe8f
This commit is contained in:
Dan Stoza 2015-03-09 10:04:11 -07:00
parent 5fec79156d
commit 24a42e9f54
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

@ -617,7 +617,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) {