summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Renouf <mrenouf@google.com> 2024-02-06 14:19:24 -0500
committer Mark Renouf <mrenouf@google.com> 2024-02-06 14:31:45 -0500
commit531bb351d0107e912c2d47e5d34fe53831ad11e5 (patch)
tree20bb973cb83f26e61dd4cb1610cef4b127387f94
parent2c2060e60afffcb3f565b6724178bdc8ab93bc67 (diff)
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
-rw-r--r--java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyStateProvider.java2
-rw-r--r--java/src/com/android/intentresolver/v2/emptystate/NoAppsAvailableEmptyStateProvider.java2
2 files changed, 2 insertions, 2 deletions
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;