diff options
| author | 2024-01-05 17:39:10 +0000 | |
|---|---|---|
| committer | 2024-01-05 17:39:10 +0000 | |
| commit | 037bc73654c0908e7305497d6fcb74d76b5479ec (patch) | |
| tree | 91199e4ec1d5192992949baf5fe494a2c8dd6ea2 | |
| parent | f9b479a4c33218b2eb32bd107ab2374070e76c07 (diff) | |
| parent | 46c6066811be1c268b7ebf92a194042619ca9c08 (diff) | |
Merge "Fix framework/base/tests for use_resource_processor: true" into main
| -rw-r--r-- | tests/Input/src/com/android/server/input/KeyboardLayoutManagerTests.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Input/src/com/android/server/input/KeyboardLayoutManagerTests.kt b/tests/Input/src/com/android/server/input/KeyboardLayoutManagerTests.kt index 9c335768de55..bbd4567a4454 100644 --- a/tests/Input/src/com/android/server/input/KeyboardLayoutManagerTests.kt +++ b/tests/Input/src/com/android/server/input/KeyboardLayoutManagerTests.kt @@ -36,12 +36,12 @@ import android.util.proto.ProtoOutputStream import android.view.InputDevice import android.view.inputmethod.InputMethodInfo import android.view.inputmethod.InputMethodSubtype -import androidx.test.core.R import androidx.test.core.app.ApplicationProvider import com.android.dx.mockito.inline.extended.ExtendedMockito import com.android.internal.os.KeyboardConfiguredProto import com.android.internal.util.FrameworkStatsLog import com.android.modules.utils.testing.ExtendedMockitoRule +import com.android.test.input.R import org.junit.After import org.junit.Assert.assertEquals import org.junit.Assert.assertNotEquals |