am 3949f664
: Merge "SurfaceFlinger: Fix null pointer exception"
* commit '3949f664c71ad1269ee0c921d176e3b4484015cc': SurfaceFlinger: Fix null pointer exception
This commit is contained in:
commit
b275b4dc3e
@ -620,7 +620,11 @@ status_t SurfaceFlinger::getDisplayStats(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) {
|
||||
|
Loading…
Reference in New Issue
Block a user