Introduce getResIntegerConfig
This is a symmetric to getResBooleanConfig for integers.
Test: new test in this patch
Change-Id: I36cb910acb59c3211ba2c77dd3784fefa93545d9
diff --git a/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java b/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java
index 30a1c33..f8f250d 100644
--- a/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java
+++ b/staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java
@@ -259,4 +259,17 @@
return defaultValue;
}
}
+
+ /**
+ * Gets int config from resources.
+ */
+ public static int getResIntegerConfig(@NonNull final Context context,
+ @BoolRes int configResource, final int defaultValue) {
+ final Resources res = context.getResources();
+ try {
+ return res.getInteger(configResource);
+ } catch (Resources.NotFoundException e) {
+ return defaultValue;
+ }
+ }
}
diff --git a/staticlibs/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java b/staticlibs/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java
index c65f793..a8e7993 100644
--- a/staticlibs/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java
+++ b/staticlibs/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java
@@ -283,4 +283,13 @@
doThrow(new Resources.NotFoundException()).when(mResources).getBoolean(someResId);
assertFalse(DeviceConfigUtils.getResBooleanConfig(mContext, someResId, false));
}
+
+ @Test
+ public void testGetResIntegerConfig() {
+ final int someResId = 1234;
+ doReturn(2097).when(mResources).getInteger(someResId);
+ assertEquals(2097, DeviceConfigUtils.getResIntegerConfig(mContext, someResId, 2098));
+ doThrow(new Resources.NotFoundException()).when(mResources).getInteger(someResId);
+ assertEquals(2098, DeviceConfigUtils.getResIntegerConfig(mContext, someResId, 2098));
+ }
}