PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the deprecated directlyOn method" into main am: a519bd5654

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3545520

Change-Id: I6ed116e75f81b391734e28dc800513f2ed1d643b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kevin Liu
2025-03-20 08:50:01 -07:00
committed by Automerger Merge Worker
parent 7ae4e0fa0b a519bd5654
commit c4cba7cd6b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/testutils/com/android/settings/testutils/shadow/SettingsShadowResources.java
View File

@@ -23,8 +23,6 @@ import android.content.res.Resources;
import android.content.res.Resources.NotFoundException; import android.content.res.Resources.NotFoundException;
import android.util.SparseArray; import android.util.SparseArray;
import androidx.annotation.ArrayRes;
import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements; import org.robolectric.annotation.Implements;
import org.robolectric.annotation.RealObject; import org.robolectric.annotation.RealObject;
@@ -63,12 +61,13 @@ public class SettingsShadowResources extends ShadowResources {
} }
@Implementation @Implementation
protected int[] getIntArray(@ArrayRes int id) throws NotFoundException { protected int[] getIntArray(int id) throws NotFoundException {
final Object override = sResourceOverrides.get(id); final Object override = sResourceOverrides.get(id);
if (override instanceof int[]) { if (override instanceof int[]) {
return (int[]) override; return (int[]) override;
} }
return directlyOn(realResources, Resources.class).getIntArray(id); return directlyOn(
realResources, Resources.class, "getIntArray", ClassParameter.from(int.class, id));
} }
@Implementation @Implementation