diff options
| author | Stephen Hines <srhines@google.com> | 2012-02-14 13:38:43 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-14 13:38:43 -0800 |
| commit | 0599d6ede37304bf8f9ecd90dadea7707c160cd8 (patch) | |
| tree | 613f9440e8cd72d21a6400b3361c7e9494b20081 /graphics/java/android/renderscript | |
| parent | 10e9f39f1d3f1c8dea8637a7dc59f9c6d700425d (diff) | |
| parent | 9069ee88cb62a62395e895eb6b3333a1dfcead73 (diff) | |
| download | frameworks_base-0599d6ede37304bf8f9ecd90dadea7707c160cd8.zip frameworks_base-0599d6ede37304bf8f9ecd90dadea7707c160cd8.tar.gz frameworks_base-0599d6ede37304bf8f9ecd90dadea7707c160cd8.tar.bz2 | |
Merge "Fix typos/spacing with new APIs."
Diffstat (limited to 'graphics/java/android/renderscript')
| -rw-r--r-- | graphics/java/android/renderscript/Allocation.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index 88ee362..44401c8 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 The Android Open Source Project + * Copyright (C) 2008-2012 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -131,7 +131,7 @@ public class Allocation extends BaseObj { public static final int USAGE_GRAPHICS_RENDER_TARGET = 0x0010; /** - * USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT The allcation will be + * USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT The allocation will be * used with a SurfaceTexture object. This usage will cause the * allocation to be created read only. * @@ -140,18 +140,18 @@ public class Allocation extends BaseObj { public static final int USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT_OPAQUE = 0x0020; /** - * USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT The allcation will be + * USAGE_IO_INPUT The allocation will be * used with a SurfaceTexture object. This usage will cause the * allocation to be created read only. * * @hide */ - public static final int USAGE_IO_INPUT = 0x0040; + /** - * USAGE_GRAPHICS_SURFACE_TEXTURE_INPUT The allcation will be + * USAGE_IO_OUTPUT The allocation will be * used with a SurfaceTexture object. This usage will cause the - * allocation to be created read only. + * allocation to be created write only. * * @hide */ |