diff options
| author | Romain Guy <romainguy@google.com> | 2010-08-11 14:24:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-11 14:24:20 -0700 |
| commit | 6416d5d79299e14204f41bdd9eb1a752315c68b2 (patch) | |
| tree | 3730a6dc55c7d554232ba3108785ce7e2cbf5f06 /graphics | |
| parent | 196fc9279d32f7c1270b55cf159a5d5dc372c6e9 (diff) | |
| parent | 3f9b5a253fc8229bd46d53950af9033e0f63c097 (diff) | |
| download | frameworks_base-6416d5d79299e14204f41bdd9eb1a752315c68b2.zip frameworks_base-6416d5d79299e14204f41bdd9eb1a752315c68b2.tar.gz frameworks_base-6416d5d79299e14204f41bdd9eb1a752315c68b2.tar.bz2 | |
Merge "Fix crash in Market."
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/ComposeShader.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/ComposeShader.java b/graphics/java/android/graphics/ComposeShader.java index e88211a..8d5c913 100644 --- a/graphics/java/android/graphics/ComposeShader.java +++ b/graphics/java/android/graphics/ComposeShader.java @@ -43,7 +43,7 @@ public class ComposeShader extends Shader { (mode != null) ? mode.native_instance : 0); if (mode instanceof PorterDuffXfermode) { PorterDuff.Mode pdMode = ((PorterDuffXfermode) mode).mode; - native_shader = nativePostCreate1(native_instance, shaderA.native_shader, + native_shader = nativePostCreate2(native_instance, shaderA.native_shader, shaderB.native_shader, pdMode != null ? pdMode.nativeInt : 0); } else { native_shader = nativePostCreate1(native_instance, shaderA.native_shader, |