diff options
| author | John Reck <jreck@google.com> | 2015-07-22 21:29:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-22 21:29:55 +0000 |
| commit | 3f2c51084b9d9578532c8a88e7a5444eeedc86c2 (patch) | |
| tree | 70a623172a8233e68cc3f7acbd212dbe23c8a4cb | |
| parent | 6625047a3ba26ecc52bb2757eb7576027949e435 (diff) | |
| parent | c360bef7bcf98e0ae50461524f1ae08ee3a9c609 (diff) | |
| download | frameworks_base-3f2c51084b9d9578532c8a88e7a5444eeedc86c2.zip frameworks_base-3f2c51084b9d9578532c8a88e7a5444eeedc86c2.tar.gz frameworks_base-3f2c51084b9d9578532c8a88e7a5444eeedc86c2.tar.bz2 | |
Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev
| -rw-r--r-- | services/core/java/com/android/server/AssetAtlasService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/AssetAtlasService.java b/services/core/java/com/android/server/AssetAtlasService.java index ebc810f..4569dae 100644 --- a/services/core/java/com/android/server/AssetAtlasService.java +++ b/services/core/java/com/android/server/AssetAtlasService.java @@ -93,7 +93,7 @@ public class AssetAtlasService extends IAssetAtlas.Stub { // Defines the number of int fields used to represent a single entry // in the atlas map. This number defines the size of the array returned // by the getMap(). See the mAtlasMap field for more information - private static final int ATLAS_MAP_ENTRY_FIELD_COUNT = 4; + private static final int ATLAS_MAP_ENTRY_FIELD_COUNT = 3; // Specifies how our GraphicBuffer will be used. To get proper swizzling // the buffer will be written to using OpenGL (from JNI) so we can leave |