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

Commit e0cceb28 authored by arangelov's avatar arangelov Committed by Antoan Angelov
Browse files

Check for feature flag when creating the package monitor. 

Fixes: 148657395
Test: manually used share sheet on both personal and work
profiles with the feature flag disabled

Change-Id: I02617454a57fb1933ba8e0e2a6d5598a3bb4016d
parent 134773b3

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

+2 −2
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ public class ResolverActivity extends Activity implements 
                mMultiProfilePagerAdapter.getPersonalListAdapter());

        mPersonalPackageMonitor.register(

                this, getMainLooper(), getPersonalProfileUserHandle(), false);

        if (hasWorkProfile()) {

        if (hasWorkProfile() && ENABLE_TABBED_VIEW) {

            mWorkPackageMonitor = createPackageMonitor(

                    mMultiProfilePagerAdapter.getWorkListAdapter());

            mWorkPackageMonitor.register(this, getMainLooper(), getWorkProfileUserHandle(), false);
@@ -725,7 +725,7 @@ public class ResolverActivity extends Activity implements 
        if (!mRegistered) {

            mPersonalPackageMonitor.register(this, getMainLooper(),

                    getPersonalProfileUserHandle(), false);

            if (hasWorkProfile()) {

            if (hasWorkProfile() && ENABLE_TABBED_VIEW) {

                if (mWorkPackageMonitor == null) {

                    mWorkPackageMonitor = createPackageMonitor(

                            mMultiProfilePagerAdapter.getWorkListAdapter());