am c1d4662f: am 23e16bb5: sf: Add a NULL check in getDisplayConfigs

* commit 'c1d4662f0e596021e0d8360cd1c5d213c3c8c4ba':
  sf: Add a NULL check in getDisplayConfigs
This commit is contained in:
Tatenda Chipeperekwa 2015-06-11 19:09:30 +00:00 committed by Android Git Automerger
commit 0abd853a68

View File

@ -550,7 +550,7 @@ bool SurfaceFlinger::authenticateSurfaceTexture(
status_t SurfaceFlinger::getDisplayConfigs(const sp<IBinder>& display,
Vector<DisplayInfo>* configs) {
if (configs == NULL) {
if ((configs == NULL) || (display.get() == NULL)) {
return BAD_VALUE;
}