Merge "Check for feature flag when creating the package monitor." (c62ab875) · Commits · e / os / android_frameworks_base

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());