Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4133ec1 authored by Jason Sams's avatar Jason Sams Committed by Android Git Automerger
Browse files

am ec1f1e3d: Merge change Ieab4c75b into eclair 

Merge commit 'ec1f1e3d' into eclair-mr2

* commit 'ec1f1e3d':
  Fix type in Java enums.  Not currently used, easier to fix now than when apps are using it.
parents cd79e5e1 ec1f1e3d

graphics/java/android/renderscript/ProgramStore.java

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class ProgramStore extends BaseObj { 
        SRC_ALPHA (4),

        ONE_MINUS_SRC_ALPHA (5),

        DST_ALPHA (6),

        ONE_MINUS_DST_ALPA (7),

        ONE_MINUS_DST_ALPHA (7),

        SRC_ALPHA_SATURATE (8);



        int mID;
@@ -66,7 +66,7 @@ public class ProgramStore extends BaseObj { 
        SRC_ALPHA (4),

        ONE_MINUS_SRC_ALPHA (5),

        DST_ALPHA (6),

        ONE_MINUS_DST_ALPA (7);

        ONE_MINUS_DST_ALPHA (7);



        int mID;

        BlendDstFunc(int id) {