Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev

2015-07-22 21:29:55 +00:00
parent 6625047a3b c360bef7bc
commit 3f2c51084b
1 changed files with 1 additions and 1 deletions
--- 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