From 121d051b25367340fe27a4f74cd1fac2f0d229fb Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Wed, 13 Nov 2024 08:32:00 -0800 Subject: Set package name via the build file, not via Config. Flag: EXEMPT host test change only Bug: 377765941 Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh -t Change-Id: Ied81b7c246a25ac376db93b2cd14b4d449359ca2 --- .../android/ravenwood/common/RavenwoodCommonUtils.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'ravenwood/runtime-common-src') diff --git a/ravenwood/runtime-common-src/com/android/ravenwood/common/RavenwoodCommonUtils.java b/ravenwood/runtime-common-src/com/android/ravenwood/common/RavenwoodCommonUtils.java index 520f050f0655..e83f8416214e 100644 --- a/ravenwood/runtime-common-src/com/android/ravenwood/common/RavenwoodCommonUtils.java +++ b/ravenwood/runtime-common-src/com/android/ravenwood/common/RavenwoodCommonUtils.java @@ -284,4 +284,21 @@ public class RavenwoodCommonUtils { th.printStackTrace(writer); return stringWriter.toString(); } + + /** Same as {@link Integer#parseInt(String)} but accepts null and returns null. */ + @Nullable + public static Integer parseNullableInt(@Nullable String value) { + if (value == null) { + return null; + } + return Integer.parseInt(value); + } + + /** + * @return {@code value} if it's non-null. Otherwise, returns {@code def}. + */ + @Nullable + public static T withDefault(@Nullable T value, @Nullable T def) { + return value != null ? value : def; + } } -- cgit v1.2.3-59-g8ed1b