Merge "Merge "Fix broken test" into rvc-dev am: 95e41f279d am: 4442839c7b am:... (c776191f) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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>