summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMotomu Utsumi <motomuman@google.com>2023-08-24 05:00:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-08-24 05:00:52 +0000
commit9da02983d6a9c9f8337cf908e646976652eda3d8 (patch)
treeae56e400fd02790d21040e3b4f9f8ad87cd409cc
parent23b1f29d627af4b50c4e501067a3466e46757f89 (diff)
parentb4b183607b0cb8c96b511f94b84519655d06b371 (diff)
downloadnet-9da02983d6a9c9f8337cf908e646976652eda3d8.tar.gz
Add class to help Kotlin to pass nullable to java @NonNull for testing am: b4b183607b
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2720915 Change-Id: If327e4290ef2da85a807db01dbb6f1f82bbcfb74 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--common/testutils/devicetests/com/android/testutils/NonNullTestUtils.java33
1 files changed, 33 insertions, 0 deletions
diff --git a/common/testutils/devicetests/com/android/testutils/NonNullTestUtils.java b/common/testutils/devicetests/com/android/testutils/NonNullTestUtils.java
new file mode 100644
index 00000000..463c4706
--- /dev/null
+++ b/common/testutils/devicetests/com/android/testutils/NonNullTestUtils.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.testutils;
+
+import android.annotation.NonNull;
+
+/**
+ * Utilities to help Kotlin test to verify java @NonNull code
+ */
+public class NonNullTestUtils {
+ /**
+ * This method allows Kotlin to pass nullable to @NonNull java code for testing.
+ * For Foo(@NonNull arg) java method, Kotlin can pass nullable variable by
+ * Foo(NonNullTestUtils.nullUnsafe(nullableVar)).
+ */
+ @NonNull public static <T> T nullUnsafe(T v) {
+ return v;
+ }
+}