From 531bb351d0107e912c2d47e5d34fe53831ad11e5 Mon Sep 17 00:00:00 2001 From: Mark Renouf Date: Tue, 6 Feb 2024 14:19:24 -0500 Subject: Fix usage of wrong resource constant The wrong 'R' class was referenced. Use of com.android.internal.R to fetch resources from the application will result in undefined behavior, crashes or just random strings. This is failing several activity tests due to assertions on text that is expected to appear. Test: atest IntentResolver-tests-activity Bug: n/a Change-Id: I3289b46d71469795a7e03416f29cbf8ad3868c2f --- .../intentresolver/emptystate/NoAppsAvailableEmptyStateProvider.java | 2 +- .../intentresolver/v2/emptystate/NoAppsAvailableEmptyStateProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'java') diff --git a/java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyStateProvider.java b/java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyStateProvider.java index 2653c560..5f10cf32 100644 --- a/java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyStateProvider.java +++ b/java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyStateProvider.java @@ -29,9 +29,9 @@ import android.stats.devicepolicy.nano.DevicePolicyEnums; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.intentresolver.R; import com.android.intentresolver.ResolvedComponentInfo; import com.android.intentresolver.ResolverListAdapter; -import com.android.internal.R; import java.util.List; diff --git a/java/src/com/android/intentresolver/v2/emptystate/NoAppsAvailableEmptyStateProvider.java b/java/src/com/android/intentresolver/v2/emptystate/NoAppsAvailableEmptyStateProvider.java index e9d1bb34..dfc46697 100644 --- a/java/src/com/android/intentresolver/v2/emptystate/NoAppsAvailableEmptyStateProvider.java +++ b/java/src/com/android/intentresolver/v2/emptystate/NoAppsAvailableEmptyStateProvider.java @@ -29,11 +29,11 @@ import android.stats.devicepolicy.nano.DevicePolicyEnums; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.intentresolver.R; import com.android.intentresolver.ResolvedComponentInfo; import com.android.intentresolver.ResolverListAdapter; import com.android.intentresolver.emptystate.EmptyState; import com.android.intentresolver.emptystate.EmptyStateProvider; -import com.android.internal.R; import java.util.List; -- cgit v1.2.3-59-g8ed1b