diff options
| author | Dan Stoza <stoza@google.com> | 2015-03-10 15:48:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-10 15:48:55 +0000 |
| commit | 35283ef01b53c6fce3be11158100dd950780f19e (patch) | |
| tree | c8ade0eb477ca7a2ac3c992218c171a4abe95ea2 /services/surfaceflinger/SurfaceFlinger.cpp | |
| parent | 94d5ac480286d5e4d856bb968263e6991a62002d (diff) | |
| parent | 105aa28eeff9d31eebc7645aecb7630918a09b2a (diff) | |
| download | frameworks_native-35283ef01b53c6fce3be11158100dd950780f19e.zip frameworks_native-35283ef01b53c6fce3be11158100dd950780f19e.tar.gz frameworks_native-35283ef01b53c6fce3be11158100dd950780f19e.tar.bz2 | |
am 105aa28e: am b275b4dc: am 3949f664: Merge "SurfaceFlinger: Fix null pointer exception"
* commit '105aa28eeff9d31eebc7645aecb7630918a09b2a':
SurfaceFlinger: Fix null pointer exception
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index d01b945..a560ca3 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -624,7 +624,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) { |