Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e138147 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Fix broken test" into rvc-dev am: 95e41f27 am: 4442839c am:... 

Merge "Merge "Fix broken test" into rvc-dev am: 95e41f27 am: 4442839c am: 801d335e" into rvc-qpr-dev-plus-aosp am: c776191f

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

Change-Id: I3995a56f93aa29956a2b940559e79c88961c3e19
parents 66c91be5 c776191f

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

+7 −2
Original line number 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

        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;

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

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