Merge "Merge "Fix broken test" into rvc-dev am: 95e41f279d am: 4442839c7b am: 801d335e1e" into rvc-qpr-dev-plus-aosp am: c776191f76

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818179

Change-Id: I3995a56f93aa29956a2b940559e79c88961c3e19
This commit is contained in:
Automerger Merge Worker
2020-06-11 11:52:55 +00:00
2 changed files with 12 additions and 2 deletions

View File

@@ -2816,8 +2816,7 @@ public class ChooserActivity extends ResolverActivity implements
}
// no need to query direct share for work profile when its turned off
UserManager userManager = getSystemService(UserManager.class);
if (userManager.isQuietModeEnabled(chooserListAdapter.getUserHandle())) {
if (isQuietModeEnabled(chooserListAdapter.getUserHandle())) {
getChooserActivityLogger().logSharesheetAppLoadComplete();
return;
}
@@ -2841,6 +2840,12 @@ public class ChooserActivity extends ResolverActivity implements
getChooserActivityLogger().logSharesheetAppLoadComplete();
}
@VisibleForTesting
protected boolean isQuietModeEnabled(UserHandle userHandle) {
UserManager userManager = getSystemService(UserManager.class);
return userManager.isQuietModeEnabled(userHandle);
}
private void setupScrollListener() {
if (mResolverDrawerLayout == null) {
return;

View File

@@ -222,6 +222,11 @@ public class ChooserWrapperActivity extends ChooserActivity {
super.queryTargetServices(adapter);
}
@Override
protected boolean isQuietModeEnabled(UserHandle userHandle) {
return sOverrides.isQuietModeEnabled;
}
/**
* We cannot directly mock the activity created since instrumentation creates it.
* <p>