From 4d6194f4320dfe4f6370f2ec8ddcaefe72fba013 Mon Sep 17 00:00:00 2001 From: Brian Isganitis Date: Fri, 4 Oct 2024 13:32:02 -0700 Subject: [PATCH] Allow specifying base for SandboxModelContext. Flag: TEST_ONLY Bug: 230027385 Test: go/testedequals Change-Id: I2d6c90eda30cb80fd7124d35bab62b1af1b10902 --- .../launcher3/util/LauncherModelHelper.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/multivalentTests/src/com/android/launcher3/util/LauncherModelHelper.java b/tests/multivalentTests/src/com/android/launcher3/util/LauncherModelHelper.java index 748d3765b1..09b9a3bf7c 100644 --- a/tests/multivalentTests/src/com/android/launcher3/util/LauncherModelHelper.java +++ b/tests/multivalentTests/src/com/android/launcher3/util/LauncherModelHelper.java @@ -31,6 +31,7 @@ import static org.mockito.Mockito.spy; import android.content.ContentProvider; import android.content.ContentResolver; +import android.content.Context; import android.content.pm.PackageInstaller; import android.content.pm.PackageInstaller.SessionParams; import android.content.pm.PackageManager; @@ -250,15 +251,16 @@ public class LauncherModelHelper { private final File mDbDir; public SandboxModelContext() { - super(ApplicationProvider.getApplicationContext()); + this(ApplicationProvider.getApplicationContext()); + } + + public SandboxModelContext(Context context) { + super(context); // System settings cache content provider. Ensure that they are statically initialized - Settings.Secure.getString( - ApplicationProvider.getApplicationContext().getContentResolver(), "test"); - Settings.System.getString( - ApplicationProvider.getApplicationContext().getContentResolver(), "test"); - Settings.Global.getString( - ApplicationProvider.getApplicationContext().getContentResolver(), "test"); + Settings.Secure.getString(context.getContentResolver(), "test"); + Settings.System.getString(context.getContentResolver(), "test"); + Settings.Global.getString(context.getContentResolver(), "test"); mPm = spy(getBaseContext().getPackageManager()); mDbDir = new File(getCacheDir(), UUID.randomUUID().toString());