Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ec1f1e3d: Merge change Ieab4c75b into eclair

Browse Source 
Merge commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde' into eclair-mr2

* commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde':
  Fix type in Java enums.  Not currently used, easier to fix now than when apps are using it.
This commit is contained in:
Jason Sams
2009-10-29 19:30:11 -07:00
committed by Android Git Automerger
parent cd79e5e173 ec1f1e3df1
commit e4133ec129
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/renderscript/ProgramStore.java
View File

@@ -49,7 +49,7 @@ public class ProgramStore extends BaseObj {
SRC_ALPHA (4), SRC_ALPHA (4),
ONE_MINUS_SRC_ALPHA (5), ONE_MINUS_SRC_ALPHA (5),
DST_ALPHA (6), DST_ALPHA (6),
ONE_MINUS_DST_ALPA (7), ONE_MINUS_DST_ALPHA (7),
SRC_ALPHA_SATURATE (8); SRC_ALPHA_SATURATE (8);
int mID; int mID;
@@ -66,7 +66,7 @@ public class ProgramStore extends BaseObj {
SRC_ALPHA (4), SRC_ALPHA (4),
ONE_MINUS_SRC_ALPHA (5), ONE_MINUS_SRC_ALPHA (5),
DST_ALPHA (6), DST_ALPHA (6),
ONE_MINUS_DST_ALPA (7); ONE_MINUS_DST_ALPHA (7);
int mID; int mID;
BlendDstFunc(int id) { BlendDstFunc(int id) {