diff options
| author | Tatenda Chipeperekwa <tatendac@codeaurora.org> | 2015-06-11 19:09:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-11 19:09:30 +0000 |
| commit | 0abd853a6812485f83790a29cd7938aa72f389a9 (patch) | |
| tree | 66478569d3c5d57883877f113e16b9686bfd9b3b /services | |
| parent | 586ffb0a2e5809e0f79d51b0bb0cba4476509bf1 (diff) | |
| parent | c1d4662f0e596021e0d8360cd1c5d213c3c8c4ba (diff) | |
| download | frameworks_native-0abd853a6812485f83790a29cd7938aa72f389a9.zip frameworks_native-0abd853a6812485f83790a29cd7938aa72f389a9.tar.gz frameworks_native-0abd853a6812485f83790a29cd7938aa72f389a9.tar.bz2 | |
am c1d4662f: am 23e16bb5: sf: Add a NULL check in getDisplayConfigs
* commit 'c1d4662f0e596021e0d8360cd1c5d213c3c8c4ba':
sf: Add a NULL check in getDisplayConfigs
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index a426ad6..a332cda 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -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; } |