Snap for 6203617 from ab156e4e6b8e5f76232ea8ed13ec305c3eb05860 to rvc-release

Change-Id: I6e5dac75a08d842e647baca0087fcce0111fbbc9

4 files changed, 14 insertions, 5 deletions

diff --git a/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java b/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java
index 556f885fd..99ef10a92 100644
--- a/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java
+++ b/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java
@@ -29,8 +29,7 @@ public class SdkConfig implements Comparable<SdkConfig> {
               addSdk(Build.VERSION_CODES.O, "8.0.0_r4", "r1", "REL");
               addSdk(Build.VERSION_CODES.O_MR1, "8.1.0", "4611349", "REL");
               addSdk(Build.VERSION_CODES.P, "9", "4913185-2", "REL");
-              // TODO(b/136679333): Update jar with final Q release.
-              addSdk(Build.VERSION_CODES.Q, "9plus", "5616371", "REL");
+              addSdk(Build.VERSION_CODES.Q, "10", "5803371", "REL");
               // BEGIN-INTERNAL
               addSdk(Build.VERSION_CODES.R, "R", "r0", "R");
               // END-INTERNAL
diff --git a/run_robotests.mk b/run_robotests.mk
index b995fd46a..8e70760ac 100644
--- a/run_robotests.mk
+++ b/run_robotests.mk
@@ -132,7 +132,7 @@ ifneq ($(DISABLE_ROBO_RUN_TESTS),true)
       $(android_all_lib_path)/android-all-8.0.0_r4-robolectric-r1.jar:$(my_robolectric_path)/android-all-8.0.0_r4-robolectric-r1.jar \
       $(android_all_lib_path)/android-all-8.1.0-robolectric-4611349.jar:$(my_robolectric_path)/android-all-8.1.0-robolectric-4611349.jar \
       $(android_all_lib_path)/android-all-9-robolectric-4913185-2.jar:$(my_robolectric_path)/android-all-9-robolectric-4913185-2.jar \
-      $(android_all_lib_path)/android-all-9plus-robolectric-5616371.jar:$(my_robolectric_path)/android-all-9plus-robolectric-5616371.jar \
+      $(android_all_lib_path)/android-all-10-robolectric-5803371.jar:$(my_robolectric_path)/android-all-10-robolectric-5803371.jar \
       $(local_android_all_source_jar):$(my_robolectric_path)/android-all-R-robolectric-r0.jar
     copy_android_all_jars := $(call copy-many-files, $(copy_android_all_jar_pairs))
 
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowApplicationPackageManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowApplicationPackageManager.java
index f19bcd964..9b7d36da6 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowApplicationPackageManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowApplicationPackageManager.java
@@ -1219,6 +1219,13 @@ public class ShadowApplicationPackageManager extends ShadowPackageManager {
     throw new NameNotFoundException(packageName);
   }
 
+  @Implementation
+  protected ApplicationInfo getApplicationInfoAsUser(
+          String packageName, int flags, UserHandle userId) throws NameNotFoundException {
+    // Currently does not use the user ID.
+    return getApplicationInfo(packageName, flags);
+  }
+
   /**
    * Returns all the values added via {@link
    * ShadowPackageManager#addSystemSharedLibraryName(String)}.
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java
index dec01f9ff..b5c67555c 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowDevicePolicyManager.java
@@ -93,7 +93,7 @@ public class ShadowDevicePolicyManager {
   private final Map<PackageAndPermission, Integer> appPermissionGrantStateMap = new HashMap<>();
   private final Map<ComponentName, byte[]> passwordResetTokens = new HashMap<>();
   private final Set<ComponentName> componentsWithActivatedTokens = new HashSet<>();
-  private final Set<String> defaultCrossProfilePackages = new HashSet<>();
+  private Set<String> defaultCrossProfilePackages = new HashSet<>();
   private Collection<String> packagesToFailForSetApplicationHidden = Collections.emptySet();
   private Set<String> crossProfileCalendarPackages = Collections.emptySet();
   private Context context;
@@ -873,7 +873,7 @@ public class ShadowDevicePolicyManager {
     crossProfileCalendarPackages = packageNames;
   }
 
-  @Implementation(minSdk=R)
+  @Implementation(minSdk = R)
   protected Set<String> getDefaultCrossProfilePackages() {
     return new HashSet<>(defaultCrossProfilePackages);
   }
@@ -881,5 +881,8 @@ public class ShadowDevicePolicyManager {
   public void addDefaultCrossProfilePackage(String packageName) {
     defaultCrossProfilePackages.add(packageName);
   }
+  public void setDefaultCrossProfilePackages(Set<String> defaultCrossProfilePackages) {
+    this.defaultCrossProfilePackages = new HashSet<>(defaultCrossProfilePackages);
+  }
   // END-INTERNAL
 }