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

Commit fc0c28f5 authored by Michael W's avatar Michael W
Browse files

Contacts: Don't crash if Blocked Number Storage is disabled 

If the provider is disabled or missing, trying to resolve
content://com.android.blockednumber/ will result in an
IllegalArgumentException. Don't allow to block numbers if the
provider is missing, or else the Contact app will crash upon
opening the preferences.

Solution based on commit 96f9c9cd2cfcde1a1c8dcc46ff21ed6452c27eb5
by Gabriele M <moto.falcon.git@gmail.com>

Change-Id: Ib95d5e7e8b4b625e6c20f537b84da9d09ebef6ea
parent dfdc8bb0

src/com/android/contacts/activities/PeopleActivity.java

+6 −1
Original line number Diff line number Diff line
@@ -1358,9 +1358,14 @@ public class PeopleActivity extends ContactsActivity implements 
            helpMenu.setVisible(HelpUtils.isHelpAndFeedbackAvailable());

        }

        final boolean showMiscOptions = !isSearchOrSelectionMode;

        final boolean showBlockedNumbers = PhoneCapabilityTester.isPhone(this)

        boolean showBlockedNumbers = false;

        try {

            showBlockedNumbers = PhoneCapabilityTester.isPhone(this)

                && ContactsUtils.FLAG_N_FEATURE

                && BlockedNumberContract.canCurrentUserBlockNumbers(this);

        } catch (IllegalArgumentException e) {

            Log.d(TAG, "Could not get content resolver", e);

        }

        makeMenuItemVisible(menu, R.id.menu_search, showMiscOptions);

        makeMenuItemVisible(menu, R.id.menu_import_export, showMiscOptions);

        makeMenuItemVisible(menu, R.id.menu_accounts, showMiscOptions);