summaryrefslogtreecommitdiff
path: root/tests/shared
diff options
context:
space:
mode:
author Matt Casey <mrcasey@google.com> 2025-02-14 18:02:11 +0000
committer Matt Casey <mrcasey@google.com> 2025-02-14 19:33:55 +0000
commitf76f38418c3aad657f107f1d86d3947308195700 (patch)
treeba73133fba637d38f5b6acf9791d89f843d110c0 /tests/shared
parent5e90a052a4341270a7647d75def46e73d3d64047 (diff)
HSUM fixes for ChooserActivityTest
It's using the instrumentation's personal user ID but then has hard-coded work and clone profile IDs. On HSUM, those were colliding. Bug: 396572907 Bug: 396572029 Test: atest ChooserActivityTest (on HSUM and non-HSUM devices) Flag: EXEMPT test only Change-Id: If5c5c9ad7f23b057ee18b8931cf9086725b36859
Diffstat (limited to 'tests/shared')
-rw-r--r--tests/shared/src/com/android/intentresolver/ResolverDataProvider.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/shared/src/com/android/intentresolver/ResolverDataProvider.java b/tests/shared/src/com/android/intentresolver/ResolverDataProvider.java
index db109941..3953d89c 100644
--- a/tests/shared/src/com/android/intentresolver/ResolverDataProvider.java
+++ b/tests/shared/src/com/android/intentresolver/ResolverDataProvider.java
@@ -36,7 +36,7 @@ import androidx.annotation.NonNull;
*/
public class ResolverDataProvider {
- static private int USER_SOMEONE_ELSE = 10;
+ private static int sUserSomeoneElse = 99;
static ResolvedComponentInfo createResolvedComponentInfo(int i) {
return new ResolvedComponentInfo(
@@ -73,7 +73,7 @@ public class ResolverDataProvider {
return new ResolvedComponentInfo(
createComponentName(i),
createResolverIntent(i),
- createResolveInfo(i, USER_SOMEONE_ELSE));
+ createResolveInfo(i, sUserSomeoneElse));
}
public static ResolvedComponentInfo createResolvedComponentInfoWithOtherId(int i,
@@ -81,7 +81,7 @@ public class ResolverDataProvider {
return new ResolvedComponentInfo(
createComponentName(i),
createResolverIntent(i),
- createResolveInfo(i, USER_SOMEONE_ELSE, resolvedForUser));
+ createResolveInfo(i, sUserSomeoneElse, resolvedForUser));
}
static ResolvedComponentInfo createResolvedComponentInfoWithOtherId(int i, int userId) {