Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Construct AppsFilter cache on background thread

Browse Source 
This change moves the initial bootstrapping of the apps filter cache off
onto a secondary thread to avoid impacting the boottime critical path.

Fixes: 162347084
Bug: 161250592
Test: atest AppsFilterTest AppEnumerationTests
Change-Id: Iafa85e838d7f753eaf74037c85f86ee1feeb17aa
(cherry picked from commit 6ab5b2975e)
Merged-In: Iafa85e838d7f753eaf74037c85f86ee1feeb17aa
Merged-In: Iac2948fb2ad66e45161627f637f039a5f4faf88c
This commit is contained in:
Patrick Baumann
2020-07-20 11:06:47 -07:00
parent 046b604fd4
commit b0f1feb01f
3 changed files with 174 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
services/core/java/com/android/server/pm/AppsFilter.java
View File

@@ -35,6 +35,9 @@ import android.content.pm.parsing.component.ParsedInstrumentation;
import android.content.pm.parsing.component.ParsedIntentInfo; import android.content.pm.parsing.component.ParsedIntentInfo;
import android.content.pm.parsing.component.ParsedMainComponent; import android.content.pm.parsing.component.ParsedMainComponent;
import android.content.pm.parsing.component.ParsedProvider; import android.content.pm.parsing.component.ParsedProvider;
import android.os.Handler;
import android.os.HandlerExecutor;
import android.os.HandlerThread;
import android.os.Process; import android.os.Process;
import android.os.Trace; import android.os.Trace;
import android.os.UserHandle; import android.os.UserHandle;
@@ -48,6 +51,7 @@ import android.util.SparseBooleanArray;
import android.util.SparseSetArray; import android.util.SparseSetArray;
import com.android.internal.R; import com.android.internal.R;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import com.android.server.FgThread; import com.android.server.FgThread;
@@ -61,6 +65,7 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.concurrent.Executor;
/** /**
* The entity responsible for filtering visibility between apps based on declarations in their * The entity responsible for filtering visibility between apps based on declarations in their
@@ -95,6 +100,12 @@ public class AppsFilter {
*/ */
private final SparseSetArray<Integer> mQueriesViaComponent = new SparseSetArray<>(); private final SparseSetArray<Integer> mQueriesViaComponent = new SparseSetArray<>();
/**
* Executor for running reasonably short background tasks such as building the initial
* visibility cache.
*/
private final Executor mBackgroundExecutor;
/** /**
* Pending full recompute of mQueriesViaComponent. Occurs when a package adds a new set of * Pending full recompute of mQueriesViaComponent. Occurs when a package adds a new set of
* protected broadcast. This in turn invalidates all prior additions and require a very * protected broadcast. This in turn invalidates all prior additions and require a very
@@ -125,6 +136,8 @@ public class AppsFilter {
private PackageParser.SigningDetails mSystemSigningDetails; private PackageParser.SigningDetails mSystemSigningDetails;
private Set<String> mProtectedBroadcasts = new ArraySet<>(); private Set<String> mProtectedBroadcasts = new ArraySet<>();
private final Object mCacheLock = new Object();
/** /**
* This structure maps uid -> uid and indicates whether access from the first should be * This structure maps uid -> uid and indicates whether access from the first should be
* filtered to the second. It's essentially a cache of the * filtered to the second. It's essentially a cache of the
@@ -132,6 +145,7 @@ public class AppsFilter {
* NOTE: It can only be relied upon after the system is ready to avoid unnecessary update on * NOTE: It can only be relied upon after the system is ready to avoid unnecessary update on
* initial scam and is null until {@link #onSystemReady()} is called. * initial scam and is null until {@link #onSystemReady()} is called.
*/ */
@GuardedBy("mCacheLock")
private volatile SparseArray<SparseBooleanArray> mShouldFilterCache; private volatile SparseArray<SparseBooleanArray> mShouldFilterCache;
@VisibleForTesting(visibility = PRIVATE) @VisibleForTesting(visibility = PRIVATE)
@@ -139,13 +153,15 @@ public class AppsFilter {
FeatureConfig featureConfig, FeatureConfig featureConfig,
String[] forceQueryableWhitelist, String[] forceQueryableWhitelist,
boolean systemAppsQueryable, boolean systemAppsQueryable,
@Nullable OverlayReferenceMapper.Provider overlayProvider) { @Nullable OverlayReferenceMapper.Provider overlayProvider,
Executor backgroundExecutor) {
mFeatureConfig = featureConfig; mFeatureConfig = featureConfig;
mForceQueryableByDevicePackageNames = forceQueryableWhitelist; mForceQueryableByDevicePackageNames = forceQueryableWhitelist;
mSystemAppsQueryable = systemAppsQueryable; mSystemAppsQueryable = systemAppsQueryable;
mOverlayReferenceMapper = new OverlayReferenceMapper(true /*deferRebuild*/, mOverlayReferenceMapper = new OverlayReferenceMapper(true /*deferRebuild*/,
overlayProvider); overlayProvider);
mStateProvider = stateProvider; mStateProvider = stateProvider;
mBackgroundExecutor = backgroundExecutor;
} }
/** /**
@@ -337,8 +353,13 @@ public class AppsFilter {
injector.getUserManagerInternal().getUserInfos()); injector.getUserManagerInternal().getUserInfos());
} }
}; };
HandlerThread appsFilterThread = new HandlerThread("appsFilter");
appsFilterThread.start();
Handler appsFilterHandler = new Handler(appsFilterThread.getLooper());
Executor executor = new HandlerExecutor(appsFilterHandler);
AppsFilter appsFilter = new AppsFilter(stateProvider, featureConfig, AppsFilter appsFilter = new AppsFilter(stateProvider, featureConfig,
forcedQueryablePackageNames, forceSystemAppsQueryable, null); forcedQueryablePackageNames, forceSystemAppsQueryable, null, executor);
featureConfig.setAppsFilter(appsFilter); featureConfig.setAppsFilter(appsFilter);
return appsFilter; return appsFilter;
} }
@@ -470,29 +491,26 @@ public class AppsFilter {
if (mImplicitlyQueryable.add(recipientUid, visibleUid) && DEBUG_LOGGING) { if (mImplicitlyQueryable.add(recipientUid, visibleUid) && DEBUG_LOGGING) {
Slog.i(TAG, "implicit access granted: " + recipientUid + " -> " + visibleUid); Slog.i(TAG, "implicit access granted: " + recipientUid + " -> " + visibleUid);
} }
if (mShouldFilterCache != null) { synchronized (mCacheLock) {
// update the cache in a one-off manner since we've got all the information we need. if (mShouldFilterCache != null) {
SparseBooleanArray visibleUids = mShouldFilterCache.get(recipientUid); // update the cache in a one-off manner since we've got all the information we
if (visibleUids == null) { // need.
visibleUids = new SparseBooleanArray(); SparseBooleanArray visibleUids = mShouldFilterCache.get(recipientUid);
mShouldFilterCache.put(recipientUid, visibleUids); if (visibleUids == null) {
visibleUids = new SparseBooleanArray();
mShouldFilterCache.put(recipientUid, visibleUids);
}
visibleUids.put(visibleUid, false);
} }
visibleUids.put(visibleUid, false);
} }
} }
} }
public void onSystemReady() { public void onSystemReady() {
mStateProvider.runWithState(new StateProvider.CurrentStateCallback() {
@Override
public void currentState(ArrayMap<String, PackageSetting> settings,
UserInfo[] users) {
mShouldFilterCache = new SparseArray<>(users.length * settings.size());
}
});
mFeatureConfig.onSystemReady();
mOverlayReferenceMapper.rebuildIfDeferred(); mOverlayReferenceMapper.rebuildIfDeferred();
updateEntireShouldFilterCache(); mFeatureConfig.onSystemReady();
updateEntireShouldFilterCacheAsync();
} }
/** /**
@@ -510,10 +528,12 @@ public class AppsFilter {
} }
mStateProvider.runWithState((settings, users) -> { mStateProvider.runWithState((settings, users) -> {
addPackageInternal(newPkgSetting, settings); addPackageInternal(newPkgSetting, settings);
if (mShouldFilterCache != null) { synchronized (mCacheLock) {
updateShouldFilterCacheForPackage( if (mShouldFilterCache != null) {
null, newPkgSetting, settings, users, settings.size()); updateShouldFilterCacheForPackage(mShouldFilterCache, null, newPkgSetting,
} // else, rebuild entire cache when system is ready settings, users, settings.size());
} // else, rebuild entire cache when system is ready
}
}); });
} finally { } finally {
Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
@@ -607,6 +627,7 @@ public class AppsFilter {
mFeatureConfig.updatePackageState(newPkgSetting, false /*removed*/); mFeatureConfig.updatePackageState(newPkgSetting, false /*removed*/);
} }
@GuardedBy("mCacheLock")
private void removeAppIdFromVisibilityCache(int appId) { private void removeAppIdFromVisibilityCache(int appId) {
if (mShouldFilterCache == null) { if (mShouldFilterCache == null) {
return; return;
@@ -625,33 +646,47 @@ public class AppsFilter {
} }
} }
private void updateEntireShouldFilterCacheAsync() {
mBackgroundExecutor.execute(this::updateEntireShouldFilterCache);
}
private void updateEntireShouldFilterCache() { private void updateEntireShouldFilterCache() {
mStateProvider.runWithState((settings, users) -> { mStateProvider.runWithState((settings, users) -> {
mShouldFilterCache.clear(); SparseArray<SparseBooleanArray> cache =
new SparseArray<>(users.length * settings.size());
for (int i = settings.size() - 1; i >= 0; i--) { for (int i = settings.size() - 1; i >= 0; i--) {
updateShouldFilterCacheForPackage( updateShouldFilterCacheForPackage(cache,
null /*skipPackage*/, settings.valueAt(i), settings, users, i); null /*skipPackage*/, settings.valueAt(i), settings, users, i);
} }
synchronized (mCacheLock) {
mShouldFilterCache = cache;
}
}); });
} }
public void onUsersChanged() { public void onUsersChanged() {
if (mShouldFilterCache != null) { synchronized (mCacheLock) {
updateEntireShouldFilterCache(); if (mShouldFilterCache != null) {
updateEntireShouldFilterCache();
}
} }
} }
private void updateShouldFilterCacheForPackage(String packageName) { private void updateShouldFilterCacheForPackage(String packageName) {
mStateProvider.runWithState((settings, users) -> { synchronized (mCacheLock) {
updateShouldFilterCacheForPackage(null /* skipPackage */, settings.get(packageName), if (mShouldFilterCache != null) {
settings, users, settings.size() /*maxIndex*/); mStateProvider.runWithState((settings, users) -> {
}); updateShouldFilterCacheForPackage(mShouldFilterCache, null /* skipPackage */,
settings.get(packageName), settings, users,
settings.size() /*maxIndex*/);
});
}
}
} }
private void updateShouldFilterCacheForPackage(@Nullable String skipPackageName, private void updateShouldFilterCacheForPackage(SparseArray<SparseBooleanArray> cache,
PackageSetting subjectSetting, ArrayMap<String, PackageSetting> allSettings, @Nullable String skipPackageName, PackageSetting subjectSetting, ArrayMap<String,
UserInfo[] allUsers, int maxIndex) { PackageSetting> allSettings, UserInfo[] allUsers, int maxIndex) {
for (int i = Math.min(maxIndex, allSettings.size() - 1); i >= 0; i--) { for (int i = Math.min(maxIndex, allSettings.size() - 1); i >= 0; i--) {
PackageSetting otherSetting = allSettings.valueAt(i); PackageSetting otherSetting = allSettings.valueAt(i);
if (subjectSetting.appId == otherSetting.appId) { if (subjectSetting.appId == otherSetting.appId) {
@@ -668,17 +703,17 @@ public class AppsFilter {
for (int ou = 0; ou < userCount; ou++) { for (int ou = 0; ou < userCount; ou++) {
int otherUser = allUsers[ou].id; int otherUser = allUsers[ou].id;
int subjectUid = UserHandle.getUid(subjectUser, subjectSetting.appId); int subjectUid = UserHandle.getUid(subjectUser, subjectSetting.appId);
if (!mShouldFilterCache.contains(subjectUid)) { if (!cache.contains(subjectUid)) {
mShouldFilterCache.put(subjectUid, new SparseBooleanArray(appxUidCount)); cache.put(subjectUid, new SparseBooleanArray(appxUidCount));
} }
int otherUid = UserHandle.getUid(otherUser, otherSetting.appId); int otherUid = UserHandle.getUid(otherUser, otherSetting.appId);
if (!mShouldFilterCache.contains(otherUid)) { if (!cache.contains(otherUid)) {
mShouldFilterCache.put(otherUid, new SparseBooleanArray(appxUidCount)); cache.put(otherUid, new SparseBooleanArray(appxUidCount));
} }
mShouldFilterCache.get(subjectUid).put(otherUid, cache.get(subjectUid).put(otherUid,
shouldFilterApplicationInternal( shouldFilterApplicationInternal(
subjectUid, subjectSetting, otherSetting, otherUser)); subjectUid, subjectSetting, otherSetting, otherUser));
mShouldFilterCache.get(otherUid).put(subjectUid, cache.get(otherUid).put(subjectUid,
shouldFilterApplicationInternal( shouldFilterApplicationInternal(
otherUid, otherSetting, subjectSetting, subjectUser)); otherUid, otherSetting, subjectSetting, subjectUser));
} }
@@ -712,7 +747,8 @@ public class AppsFilter {
* This method recomputes all component / intent-based visibility and is intended to match the * This method recomputes all component / intent-based visibility and is intended to match the
* relevant logic of {@link #addPackageInternal(PackageSetting, ArrayMap)} * relevant logic of {@link #addPackageInternal(PackageSetting, ArrayMap)}
*/ */
private void recomputeComponentVisibility(ArrayMap<String, PackageSetting> existingSettings) { private void recomputeComponentVisibility(
ArrayMap<String, PackageSetting> existingSettings) {
mQueriesViaComponent.clear(); mQueriesViaComponent.clear();
for (int i = existingSettings.size() - 1; i >= 0; i--) { for (int i = existingSettings.size() - 1; i >= 0; i--) {
PackageSetting setting = existingSettings.valueAt(i); PackageSetting setting = existingSettings.valueAt(i);
@@ -854,15 +890,17 @@ public class AppsFilter {
} }
} }
removeAppIdFromVisibilityCache(setting.appId); synchronized (mCacheLock) {
if (mShouldFilterCache != null && setting.sharedUser != null) { removeAppIdFromVisibilityCache(setting.appId);
for (int i = setting.sharedUser.packages.size() - 1; i >= 0; i--) { if (mShouldFilterCache != null && setting.sharedUser != null) {
PackageSetting siblingSetting = setting.sharedUser.packages.valueAt(i); for (int i = setting.sharedUser.packages.size() - 1; i >= 0; i--) {
if (siblingSetting == setting) { PackageSetting siblingSetting = setting.sharedUser.packages.valueAt(i);
continue; if (siblingSetting == setting) {
continue;
}
updateShouldFilterCacheForPackage(mShouldFilterCache, setting.name,
siblingSetting, settings, users, settings.size());
} }
updateShouldFilterCacheForPackage(
setting.name, siblingSetting, settings, users, settings.size());
} }
} }
}); });
@@ -888,26 +926,29 @@ public class AppsFilter {
|| callingAppId == targetPkgSetting.appId) { || callingAppId == targetPkgSetting.appId) {
return false; return false;
} }
if (mShouldFilterCache != null) { // use cache synchronized (mCacheLock) {
SparseBooleanArray shouldFilterTargets = mShouldFilterCache.get(callingUid); if (mShouldFilterCache != null) { // use cache
final int targetUid = UserHandle.getUid(userId, targetPkgSetting.appId); SparseBooleanArray shouldFilterTargets = mShouldFilterCache.get(callingUid);
if (shouldFilterTargets == null) { final int targetUid = UserHandle.getUid(userId, targetPkgSetting.appId);
Slog.wtf(TAG, "Encountered calling uid with no cached rules: " + callingUid); if (shouldFilterTargets == null) {
return true; Slog.wtf(TAG, "Encountered calling uid with no cached rules: "
} + callingUid);
int indexOfTargetUid = shouldFilterTargets.indexOfKey(targetUid); return true;
if (indexOfTargetUid < 0) { }
Slog.w(TAG, "Encountered calling -> target with no cached rules: " int indexOfTargetUid = shouldFilterTargets.indexOfKey(targetUid);
+ callingUid + " -> " + targetUid); if (indexOfTargetUid < 0) {
return true; Slog.w(TAG, "Encountered calling -> target with no cached rules: "
} + callingUid + " -> " + targetUid);
if (!shouldFilterTargets.valueAt(indexOfTargetUid)) { return true;
return false; }
} if (!shouldFilterTargets.valueAt(indexOfTargetUid)) {
} else { return false;
if (!shouldFilterApplicationInternal( }
callingUid, callingSetting, targetPkgSetting, userId)) { } else {
return false; if (!shouldFilterApplicationInternal(
callingUid, callingSetting, targetPkgSetting, userId)) {
return false;
}
} }
} }
if (DEBUG_LOGGING || mFeatureConfig.isLoggingEnabled(callingAppId)) { if (DEBUG_LOGGING || mFeatureConfig.isLoggingEnabled(callingAppId)) {

4
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -21413,8 +21413,6 @@ public class PackageManagerService extends IPackageManager.Stub
.getUriFor(Secure.INSTANT_APPS_ENABLED), false, co, UserHandle.USER_ALL); .getUriFor(Secure.INSTANT_APPS_ENABLED), false, co, UserHandle.USER_ALL);
co.onChange(true); co.onChange(true);
mAppsFilter.onSystemReady();
// Disable any carrier apps. We do this very early in boot to prevent the apps from being // Disable any carrier apps. We do this very early in boot to prevent the apps from being
// disabled after already being started. // disabled after already being started.
CarrierAppUtils.disableCarrierAppsUntilPrivileged( CarrierAppUtils.disableCarrierAppsUntilPrivileged(
@@ -21563,6 +21561,8 @@ public class PackageManagerService extends IPackageManager.Stub
mInstallerService.restoreAndApplyStagedSessionIfNeeded(); mInstallerService.restoreAndApplyStagedSessionIfNeeded();
mExistingPackages = null; mExistingPackages = null;
mAppsFilter.onSystemReady();
} }
public void waitForAppDataPrepared() { public void waitForAppDataPrepared() {

91
services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java
View File

@@ -72,6 +72,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.function.IntFunction; import java.util.function.IntFunction;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.concurrent.Executor;
@Presubmit @Presubmit
@RunWith(JUnit4.class) @RunWith(JUnit4.class)
@@ -91,6 +92,8 @@ public class AppsFilterTest {
AppsFilter.FeatureConfig mFeatureConfigMock; AppsFilter.FeatureConfig mFeatureConfigMock;
@Mock @Mock
AppsFilter.StateProvider mStateProvider; AppsFilter.StateProvider mStateProvider;
@Mock
Executor mMockExecutor;
private ArrayMap<String, PackageSetting> mExisting = new ArrayMap<>(); private ArrayMap<String, PackageSetting> mExisting = new ArrayMap<>();
@@ -187,10 +190,15 @@ public class AppsFilterTest {
doAnswer(invocation -> { doAnswer(invocation -> {
((AppsFilter.StateProvider.CurrentStateCallback) invocation.getArgument(0)) ((AppsFilter.StateProvider.CurrentStateCallback) invocation.getArgument(0))
.currentState(mExisting, USER_INFO_LIST); .currentState(mExisting, USER_INFO_LIST);
return null; return new Object();
}).when(mStateProvider) }).when(mStateProvider)
.runWithState(any(AppsFilter.StateProvider.CurrentStateCallback.class)); .runWithState(any(AppsFilter.StateProvider.CurrentStateCallback.class));
doAnswer(invocation -> {
((Runnable) invocation.getArgument(0)).run();
return new Object();
}).when(mMockExecutor).execute(any(Runnable.class));
when(mFeatureConfigMock.isGloballyEnabled()).thenReturn(true); when(mFeatureConfigMock.isGloballyEnabled()).thenReturn(true);
when(mFeatureConfigMock.packageIsEnabled(any(AndroidPackage.class))).thenAnswer( when(mFeatureConfigMock.packageIsEnabled(any(AndroidPackage.class))).thenAnswer(
(Answer<Boolean>) invocation -> (Answer<Boolean>) invocation ->
@@ -201,7 +209,8 @@ public class AppsFilterTest {
@Test @Test
public void testSystemReadyPropogates() throws Exception { public void testSystemReadyPropogates() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
verify(mFeatureConfigMock).onSystemReady(); verify(mFeatureConfigMock).onSystemReady();
} }
@@ -209,7 +218,8 @@ public class AppsFilterTest {
@Test @Test
public void testQueriesAction_FilterMatches() throws Exception { public void testQueriesAction_FilterMatches() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -225,7 +235,8 @@ public class AppsFilterTest {
@Test @Test
public void testQueriesProtectedAction_FilterDoesNotMatch() throws Exception { public void testQueriesProtectedAction_FilterDoesNotMatch() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
final Signature frameworkSignature = Mockito.mock(Signature.class); final Signature frameworkSignature = Mockito.mock(Signature.class);
final PackageParser.SigningDetails frameworkSigningDetails = final PackageParser.SigningDetails frameworkSigningDetails =
new PackageParser.SigningDetails(new Signature[]{frameworkSignature}, 1); new PackageParser.SigningDetails(new Signature[]{frameworkSignature}, 1);
@@ -263,7 +274,8 @@ public class AppsFilterTest {
@Test @Test
public void testQueriesProvider_FilterMatches() throws Exception { public void testQueriesProvider_FilterMatches() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -280,7 +292,8 @@ public class AppsFilterTest {
@Test @Test
public void testQueriesDifferentProvider_Filters() throws Exception { public void testQueriesDifferentProvider_Filters() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -297,7 +310,8 @@ public class AppsFilterTest {
@Test @Test
public void testQueriesProviderWithSemiColon_FilterMatches() throws Exception { public void testQueriesProviderWithSemiColon_FilterMatches() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -315,7 +329,8 @@ public class AppsFilterTest {
@Test @Test
public void testQueriesAction_NoMatchingAction_Filters() throws Exception { public void testQueriesAction_NoMatchingAction_Filters() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -331,7 +346,8 @@ public class AppsFilterTest {
@Test @Test
public void testQueriesAction_NoMatchingActionFilterLowSdk_DoesntFilter() throws Exception { public void testQueriesAction_NoMatchingActionFilterLowSdk_DoesntFilter() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -351,7 +367,8 @@ public class AppsFilterTest {
@Test @Test
public void testNoQueries_Filters() throws Exception { public void testNoQueries_Filters() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -367,7 +384,8 @@ public class AppsFilterTest {
@Test @Test
public void testForceQueryable_DoesntFilter() throws Exception { public void testForceQueryable_DoesntFilter() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -384,7 +402,7 @@ public class AppsFilterTest {
public void testForceQueryableByDevice_SystemCaller_DoesntFilter() throws Exception { public void testForceQueryableByDevice_SystemCaller_DoesntFilter() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{"com.some.package"}, new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{"com.some.package"},
false, null); false, null, mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -402,7 +420,8 @@ public class AppsFilterTest {
@Test @Test
public void testSystemSignedTarget_DoesntFilter() throws CertificateException { public void testSystemSignedTarget_DoesntFilter() throws CertificateException {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
final Signature frameworkSignature = Mockito.mock(Signature.class); final Signature frameworkSignature = Mockito.mock(Signature.class);
@@ -431,7 +450,7 @@ public class AppsFilterTest {
public void testForceQueryableByDevice_NonSystemCaller_Filters() throws Exception { public void testForceQueryableByDevice_NonSystemCaller_Filters() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{"com.some.package"}, new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{"com.some.package"},
false, null); false, null, mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -449,7 +468,7 @@ public class AppsFilterTest {
public void testSystemQueryable_DoesntFilter() throws Exception { public void testSystemQueryable_DoesntFilter() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{},
true /* system force queryable */, null); true /* system force queryable */, null, mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -466,7 +485,8 @@ public class AppsFilterTest {
@Test @Test
public void testQueriesPackage_DoesntFilter() throws Exception { public void testQueriesPackage_DoesntFilter() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -484,7 +504,8 @@ public class AppsFilterTest {
when(mFeatureConfigMock.packageIsEnabled(any(AndroidPackage.class))) when(mFeatureConfigMock.packageIsEnabled(any(AndroidPackage.class)))
.thenReturn(false); .thenReturn(false);
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -500,7 +521,8 @@ public class AppsFilterTest {
@Test @Test
public void testSystemUid_DoesntFilter() throws Exception { public void testSystemUid_DoesntFilter() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -515,7 +537,8 @@ public class AppsFilterTest {
@Test @Test
public void testSystemUidSecondaryUser_DoesntFilter() throws Exception { public void testSystemUidSecondaryUser_DoesntFilter() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -531,7 +554,8 @@ public class AppsFilterTest {
@Test @Test
public void testNonSystemUid_NoCallingSetting_Filters() throws Exception { public void testNonSystemUid_NoCallingSetting_Filters() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -545,7 +569,8 @@ public class AppsFilterTest {
@Test @Test
public void testNoTargetPackage_filters() throws Exception { public void testNoTargetPackage_filters() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -603,7 +628,8 @@ public class AppsFilterTest {
} }
return Collections.emptyMap(); return Collections.emptyMap();
} }
}); },
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -675,7 +701,8 @@ public class AppsFilterTest {
} }
return Collections.emptyMap(); return Collections.emptyMap();
} }
}); },
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -700,7 +727,8 @@ public class AppsFilterTest {
@Test @Test
public void testInitiatingApp_DoesntFilter() throws Exception { public void testInitiatingApp_DoesntFilter() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -716,7 +744,8 @@ public class AppsFilterTest {
@Test @Test
public void testUninstalledInitiatingApp_Filters() throws Exception { public void testUninstalledInitiatingApp_Filters() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -732,7 +761,8 @@ public class AppsFilterTest {
@Test @Test
public void testOriginatingApp_Filters() throws Exception { public void testOriginatingApp_Filters() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -748,7 +778,8 @@ public class AppsFilterTest {
@Test @Test
public void testInstallingApp_DoesntFilter() throws Exception { public void testInstallingApp_DoesntFilter() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -764,7 +795,8 @@ public class AppsFilterTest {
@Test @Test
public void testInstrumentation_DoesntFilter() throws Exception { public void testInstrumentation_DoesntFilter() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();
@@ -786,7 +818,8 @@ public class AppsFilterTest {
@Test @Test
public void testWhoCanSee() throws Exception { public void testWhoCanSee() throws Exception {
final AppsFilter appsFilter = final AppsFilter appsFilter =
new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null); new AppsFilter(mStateProvider, mFeatureConfigMock, new String[]{}, false, null,
mMockExecutor);
simulateAddBasicAndroid(appsFilter); simulateAddBasicAndroid(appsFilter);
appsFilter.onSystemReady(); appsFilter.onSystemReady();