commit 9f732331a4de632888c474811dc9584c51a86ee5
author Motomu Utsumi <motomuman@google.com> Sat Sep 10 02:02:11 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Sep 10 02:02:11 2022 +0000
tree 9cb6674d113177d9070de22f546e5e7bbe019b66
parent 2464a31bf8dafeeb62d5491df024590bdf0168a8
parent ea0fcc94eca5e2a09b3655b2b9e36995e3e48d8d

Merge "Add idiag_sock_id to InetDiagMessage class"

staticlibs/device/com/android/net/module/util/DeviceConfigUtils.java

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;
+        }
+    }
 }

staticlibs/tests/unit/src/com/android/net/module/util/DeviceConfigUtilsTest.java

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));
+    }
 }

staticlibs/testutils/Android.bp

diff --git a/staticlibs/testutils/Android.bp b/staticlibs/testutils/Android.bp
index 642544a..c9b3d07 100644
--- a/staticlibs/testutils/Android.bp
+++ b/staticlibs/testutils/Android.bp
@@ -80,6 +80,6 @@
         "host/**/*.kt",
     ],
     libs: ["tradefed"],
-    test_suites: ["device-tests", "general-tests", "cts", "mts-networking"],
+    test_suites: ["ats", "device-tests", "general-tests", "cts", "mts-networking"],
     data: [":ConnectivityChecker"],
 }