diff options
| author | wangjing <wangjing@codeaurora.org> | 2015-09-23 17:04:57 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-14 04:12:37 -0700 |
| commit | 0a4c268bd34ad240751d398ab9682f9f25b0de4d (patch) | |
| tree | aac83c3dee0c6b24de227cb6728d4fa91cfbc35f /src | |
| parent | ac4963ddbb487ce76341bc17bad83ffb38e6d066 (diff) | |
| download | android_packages_apps_Gallery2-0a4c268bd34ad240751d398ab9682f9f25b0de4d.tar.gz android_packages_apps_Gallery2-0a4c268bd34ad240751d398ab9682f9f25b0de4d.tar.bz2 android_packages_apps_Gallery2-0a4c268bd34ad240751d398ab9682f9f25b0de4d.zip | |
Gallery2:Fix null pointer exception from monkey test.
The reference is not instantiated before inovking it.
Determine whether the reference is instantiated before invoking it.
Change-Id: Ie1827506fdbef074b38c937bea45d86438386ead
CRs-Fixed:895989
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/ui/GLRootView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/ui/GLRootView.java b/src/com/android/gallery3d/ui/GLRootView.java index dc898d83d..4f3434593 100644 --- a/src/com/android/gallery3d/ui/GLRootView.java +++ b/src/com/android/gallery3d/ui/GLRootView.java @@ -499,9 +499,11 @@ public class GLRootView extends GLSurfaceView listener = mIdleListeners.removeFirst(); } mRenderLock.lock(); - boolean keepInQueue; + boolean keepInQueue = false; try { - keepInQueue = listener.onGLIdle(mCanvas, mRenderRequested); + if (mCanvas != null) { + keepInQueue = listener.onGLIdle(mCanvas, mRenderRequested); + } } finally { mRenderLock.unlock(); } |