diff options
| author | Anas Karbila <anaskarbila@gmail.com> | 2017-04-16 21:50:12 +0900 |
|---|---|---|
| committer | LuK1337 <priv.luk@gmail.com> | 2019-10-21 21:40:56 +0200 |
| commit | 664b61707af3c0f22414f76cd0b1d834c29a08a7 (patch) | |
| tree | 5f3fdc1101d977507124f5382b2a4d858b0a882a | |
| parent | 893a776ec8cdb0ac83692ee9b1dc329c11471cee (diff) | |
| download | android_packages_apps_Gallery2-664b61707af3c0f22414f76cd0b1d834c29a08a7.tar.gz android_packages_apps_Gallery2-664b61707af3c0f22414f76cd0b1d834c29a08a7.tar.bz2 android_packages_apps_Gallery2-664b61707af3c0f22414f76cd0b1d834c29a08a7.zip | |
Gallery: TileImageView: fix NPE
* GetGLRoot() can return null when the job is still running but the GL has already been detached
Change-Id: Ic58b4752f64390efdf14ca1a33a81a8f77100ee0
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
| -rw-r--r-- | src/com/android/gallery3d/ui/TileImageView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/ui/TileImageView.java b/src/com/android/gallery3d/ui/TileImageView.java index dd4b406fd..5edd9d7f0 100644 --- a/src/com/android/gallery3d/ui/TileImageView.java +++ b/src/com/android/gallery3d/ui/TileImageView.java @@ -476,7 +476,7 @@ public class TileImageView extends GLView { synchronized (this) { mUploadQueue.push(tile); } - if (mTileUploader.mActive.compareAndSet(false, true)) { + if (getGLRoot() != null && mTileUploader.mActive.compareAndSet(false, true)) { getGLRoot().addOnGLIdleListener(mTileUploader); } } |