diff options
| author | Chet Haase <chet@google.com> | 2012-09-14 15:31:25 -0700 |
|---|---|---|
| committer | Chet Haase <chet@google.com> | 2012-09-17 11:21:34 -0700 |
| commit | 603f6de35f21d74ae242d52d501f4f5c25ff4f4c (patch) | |
| tree | b249a7750a60b445a43670b7ba540beecbe715db /core/java/android/view/GLES20Canvas.java | |
| parent | cc5dd18d15a174799ad79d26633c268e8860c8ab (diff) | |
| download | frameworks_base-603f6de35f21d74ae242d52d501f4f5c25ff4f4c.zip frameworks_base-603f6de35f21d74ae242d52d501f4f5c25ff4f4c.tar.gz frameworks_base-603f6de35f21d74ae242d52d501f4f5c25ff4f4c.tar.bz2 | |
Fix occasional crash bug with layers
Launcher occasionally crashes with a stack trace indicating that the memory
of a Layer object is corrupt. It is possible for us to delete a Layer
structure and then, briefly, use it to draw a DisplayList again before
that DisplayList gets recreated (without the layer that got deleted).
When this happens, if the memory got corrupted, it's possible to crash.
The fix is to add Layer to the other objects which we currently refcount
(bitmaps, shaders, etc.). Then instead of deleting a Layer, we decrement the
refcount. We increment when creating it, then increment it again when it's
referenced from a DisplayList. Then we decrement the refcount instead of
deleting it, and decrement when we clear a DisplayList that refers to it.
Then when the refcount reaches 0, we delete it.
Issue #6994632 Native crash in launcher when trying to launch all apps screen
Change-Id: I0627be8d49bb2f9ba8d158a84b764bb4e7df934c
Diffstat (limited to 'core/java/android/view/GLES20Canvas.java')
| -rw-r--r-- | core/java/android/view/GLES20Canvas.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/GLES20Canvas.java b/core/java/android/view/GLES20Canvas.java index 869cd00..032ff7b 100644 --- a/core/java/android/view/GLES20Canvas.java +++ b/core/java/android/view/GLES20Canvas.java @@ -150,7 +150,7 @@ class GLES20Canvas extends HardwareCanvas { static native int nCreateTextureLayer(boolean opaque, int[] layerInfo); static native int nCreateLayer(int width, int height, boolean isOpaque, int[] layerInfo); - static native void nResizeLayer(int layerId, int width, int height, int[] layerInfo); + static native boolean nResizeLayer(int layerId, int width, int height, int[] layerInfo); static native void nSetOpaqueLayer(int layerId, boolean isOpaque); static native void nSetLayerPaint(int layerId, int nativePaint); static native void nSetLayerColorFilter(int layerId, int nativeColorFilter); |