From 99b5a00f837754e33111af20abddb91e0c0bcc69 Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Fri, 14 Mar 2025 22:39:17 +0000 Subject: [PATCH] Fix the deprecated directlyOn method Adjust to directlyOn method with method string and parameter type Test: atest SettingsRoboTests Change-Id: Ia15a8a722e6c8387b639da096377d9716a944b7e --- .../settings/testutils/shadow/SettingsShadowResources.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/robotests/testutils/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/testutils/com/android/settings/testutils/shadow/SettingsShadowResources.java index b2d5484dcb2..b25ce4976ce 100644 --- a/tests/robotests/testutils/com/android/settings/testutils/shadow/SettingsShadowResources.java +++ b/tests/robotests/testutils/com/android/settings/testutils/shadow/SettingsShadowResources.java @@ -23,8 +23,6 @@ import android.content.res.Resources; import android.content.res.Resources.NotFoundException; import android.util.SparseArray; -import androidx.annotation.ArrayRes; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.RealObject; @@ -63,12 +61,13 @@ public class SettingsShadowResources extends ShadowResources { } @Implementation - protected int[] getIntArray(@ArrayRes int id) throws NotFoundException { + protected int[] getIntArray(int id) throws NotFoundException { final Object override = sResourceOverrides.get(id); if (override instanceof int[]) { return (int[]) override; } - return directlyOn(realResources, Resources.class).getIntArray(id); + return directlyOn( + realResources, Resources.class, "getIntArray", ClassParameter.from(int.class, id)); } @Implementation