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

Merge "Fix broken test" into rvc-dev

Browse Source
This commit is contained in:
Antoan Angelov
2020-06-11 10:56:55 +00:00
committed by Android (Google) Code Review
parent 55e5ac8fc0 24156fa7b1
commit 95e41f279d
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/app/ChooserActivity.java
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 // no need to query direct share for work profile when its turned off
UserManager userManager = getSystemService(UserManager.class); if (isQuietModeEnabled(chooserListAdapter.getUserHandle())) {
if (userManager.isQuietModeEnabled(chooserListAdapter.getUserHandle())) {
getChooserActivityLogger().logSharesheetAppLoadComplete(); getChooserActivityLogger().logSharesheetAppLoadComplete();
return; return;
} }
@@ -2841,6 +2840,12 @@ public class ChooserActivity extends ResolverActivity implements
getChooserActivityLogger().logSharesheetAppLoadComplete(); getChooserActivityLogger().logSharesheetAppLoadComplete();
} }
@VisibleForTesting
protected boolean isQuietModeEnabled(UserHandle userHandle) {
UserManager userManager = getSystemService(UserManager.class);
return userManager.isQuietModeEnabled(userHandle);
}
private void setupScrollListener() { private void setupScrollListener() {
if (mResolverDrawerLayout == null) { if (mResolverDrawerLayout == null) {
return; return;

5
core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java
View File

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