summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author arangelov <arangelov@google.com> 2020-06-10 19:21:32 +0100
committer arangelov <arangelov@google.com> 2020-06-10 19:21:32 +0100
commit24156fa7b11b881ba3b3d58e67620840c674d1e6 (patch)
tree03d1d7fab62a5713103ca00ae24737f492753572
parente445872013bdbe53c62e0e3719a70fac0000f060 (diff)
Fix broken test
Fixes: 158656507 Test: atest ChooserActivityTest#testWorkTab_selectingWorkTabWithPausedWorkProfile_directShareTargetsNotQueried Change-Id: I875de96d4847575e6369724ca2c95b828befb5af
-rw-r--r--core/java/com/android/internal/app/ChooserActivity.java9
-rw-r--r--core/java/com/android/internal/app/ResolverListAdapter.java3
-rw-r--r--core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java5
3 files changed, 14 insertions, 3 deletions
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 2d4d9575584d..08ea5bc8d35a 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -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;
diff --git a/core/java/com/android/internal/app/ResolverListAdapter.java b/core/java/com/android/internal/app/ResolverListAdapter.java
index b1e8ed1f943e..d63ebda5117e 100644
--- a/core/java/com/android/internal/app/ResolverListAdapter.java
+++ b/core/java/com/android/internal/app/ResolverListAdapter.java
@@ -617,7 +617,8 @@ public class ResolverListAdapter extends BaseAdapter {
}
}
- UserHandle getUserHandle() {
+ @VisibleForTesting
+ public UserHandle getUserHandle() {
return mResolverListController.getUserHandle();
}
diff --git a/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java b/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java
index 44a52639bd35..0f6b51f82116 100644
--- a/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java
+++ b/core/tests/coretests/src/com/android/internal/app/ChooserWrapperActivity.java
@@ -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>