am 85e271d0: Merge "sf: Add a NULL check in getDisplayConfigs"

* commit '85e271d051770fdd5bb1bb017255f735cbd45459':
  sf: Add a NULL check in getDisplayConfigs
This commit is contained in:
Dan Stoza 2015-06-11 19:40:31 +00:00 committed by Android Git Automerger
commit 25a83393e6

View File

@ -546,7 +546,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;
}