Merge "Fix broken test" into rvc-dev am: 95e41f279d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818179 Change-Id: If2bfe029da1569be4c13aa08cd0d1c4441b5519b
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user