diff options
author | Adnan Begovic <adnan@cyngn.com> | 2015-07-16 14:03:09 -0700 |
---|---|---|
committer | Adnan Begovic <adnan@cyngn.com> | 2015-07-16 16:03:36 -0700 |
commit | 06fc4498e402ca5cd03f43294859f5fa022b58b6 (patch) | |
tree | 970cacab456c3f73ac9ab05eae3f04597f7c6a44 | |
parent | 6714bfe38ba72d43102e088099e4465ae064a439 (diff) | |
download | vendor_cmsdk-06fc4498e402ca5cd03f43294859f5fa022b58b6.zip vendor_cmsdk-06fc4498e402ca5cd03f43294859f5fa022b58b6.tar.gz vendor_cmsdk-06fc4498e402ca5cd03f43294859f5fa022b58b6.tar.bz2 |
cmsdk: Return UNKNOWN for impossible sdk ints.
Change-Id: I77a44abba0db223b031d6714c4fd8beb03a43cdc
-rw-r--r-- | src/java/cyanogenmod/os/Build.java | 9 | ||||
-rw-r--r-- | tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/java/cyanogenmod/os/Build.java b/src/java/cyanogenmod/os/Build.java index ceb865f..3595ead 100644 --- a/src/java/cyanogenmod/os/Build.java +++ b/src/java/cyanogenmod/os/Build.java @@ -17,6 +17,7 @@ package cyanogenmod.os; import android.os.SystemProperties; +import android.text.TextUtils; import android.util.SparseArray; /** @@ -84,9 +85,13 @@ public class Build { /** * Retrieve the name for the SDK int * @param sdkInt - * @return name of the SDK int + * @return name of the SDK int, {@link #UNKNOWN) if not known */ public static String getNameForSDKInt(int sdkInt) { - return sdkMap.get(sdkInt); + final String name = sdkMap.get(sdkInt); + if (TextUtils.isEmpty(name)) { + return UNKNOWN; + } + return name; } } diff --git a/tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java b/tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java index fea1f27..2b83827 100644 --- a/tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java +++ b/tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java @@ -56,4 +56,11 @@ public class BuildTest extends AndroidTestCase { } assertEquals(0, i); } + + @SmallTest + public void testSdkLevelRetrieveNameImpossible() { + String name = Build.getNameForSDKInt(Integer.MAX_VALUE); + assertNotNull(name); + assertEquals(Build.UNKNOWN, name); + } } |