1 files changed, 34 insertions, 11 deletions

diff --git a/src/java/com/jogamp/common/os/AndroidVersion.java b/src/java/com/jogamp/common/os/AndroidVersion.java
index 8886273..cb6c3e5 100644
--- a/src/java/com/jogamp/common/os/AndroidVersion.java
+++ b/src/java/com/jogamp/common/os/AndroidVersion.java
@@ -1,3 +1,30 @@
+/**
+ * Copyright 2011 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
 package com.jogamp.common.os;
 
 import java.lang.reflect.Field;
@@ -9,9 +36,6 @@ import com.jogamp.common.util.ReflectionUtil;
 public class AndroidVersion {
     public static final boolean isAvailable;
     
-    /** All SDK version map, where SDK_INT is the key to the current running version */
-    public static final Map<Integer, String> VERSION_CODES; 
-    
     /** Development codename, or the string "REL" for official release */    
     public static final String CODENAME;
     
@@ -27,8 +51,8 @@ public class AndroidVersion {
     /** SDK Version string */
     public static final String SDK_NAME;
     
-    static final String androidBuildVersion = "android.os.Build$VERSION";
-    static final String androidBuildVersionCodes = "android.os.Build$VERSION_CODES";
+    private static final String androidBuildVersion = "android.os.Build$VERSION";
+    private static final String androidBuildVersionCodes = "android.os.Build$VERSION_CODES";
     
     static {
         final ClassLoader cl = AndroidVersion.class.getClassLoader();
@@ -41,22 +65,21 @@ public class AndroidVersion {
             abvObject = abvClass.newInstance();
             abvcClass = ReflectionUtil.getClass(androidBuildVersionCodes, true, cl);
             abvcObject = abvcClass.newInstance();
-        } catch (Exception e) { /* n/a */ } 
-        isAvailable = null != abvObject ;
+        } catch (Exception e) { /* n/a */ }
+        isAvailable = null != abvObject; 
         if(isAvailable) {
             CODENAME = getString(abvClass, abvObject, "CODENAME");
             INCREMENTAL = getString(abvClass, abvObject, "INCREMENTAL");
             RELEASE = getString(abvClass, abvObject, "RELEASE");
             SDK_INT = getInt(abvClass, abvObject, "SDK_INT");
-            VERSION_CODES = getVersionCodes(abvcClass, abvcObject);
-            String sdk_name = VERSION_CODES.get(new Integer(SDK_INT));
-            SDK_NAME = ( null != sdk_name ) ? sdk_name : "SDK_"+SDK_INT ;
+            final Map<Integer, String> version_codes = getVersionCodes(abvcClass, abvcObject);
+            String sdk_name = version_codes.get(new Integer(SDK_INT));
+            SDK_NAME = ( null != sdk_name ) ? sdk_name : "SDK_"+SDK_INT ;            
         } else {
             CODENAME = null;
             INCREMENTAL = null;
             RELEASE = null;
             SDK_INT = -1;  
-            VERSION_CODES = new HashMap<Integer, String>();
             SDK_NAME = null;
         }
     }