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

Commit faa6fb15 authored by Patrick Huang's avatar Patrick Huang
Browse files

Hide power menu Emergency button if device lacks telephony 

Emergency calling requires a telephony radio.

Bug: 220435149
Fix: 220435149
Test: Manual test on phone and tablet
Change-Id: If82780289349491d66c0faa69b6fb46740ce5567
parent 33e3c435

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+9 −1
Original line number Diff line number Diff line
@@ -624,7 +624,9 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
                    addIfShouldShowAction(tempActions, new LogoutAction());

                }

            } else if (GLOBAL_ACTION_KEY_EMERGENCY.equals(actionKey)) {

                if (shouldDisplayEmergency()) {

                    addIfShouldShowAction(tempActions, new EmergencyDialerAction());

                }

            } else {

                Log.e(TAG, "Invalid global action key " + actionKey);

            }
@@ -703,6 +705,12 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
                || state == SOME_AUTH_REQUIRED_AFTER_USER_REQUEST);

    }



    @VisibleForTesting

    boolean shouldDisplayEmergency() {

        // Emergency calling requires a telephony radio.

        return mHasTelephony;

    }



    @VisibleForTesting

    boolean shouldDisplayBugReport(UserInfo currentUser) {

        return mGlobalSettings.getInt(Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogLiteTest.java

+29 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { 
    public void testCreateActionItems_lockdownEnabled_doesShowLockdown() {

        mGlobalActionsDialogLite = spy(mGlobalActionsDialogLite);

        doReturn(4).when(mGlobalActionsDialogLite).getMaxShownPowerItems();

        doReturn(true).when(mGlobalActionsDialogLite).shouldDisplayEmergency();

        doReturn(true).when(mGlobalActionsDialogLite).shouldDisplayLockdown(any());

        doReturn(true).when(mGlobalActionsDialogLite).shouldShowAction(any());

        String[] actions = {
@@ -365,8 +366,10 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { 
    public void testCreateActionItems_lockdownDisabled_doesNotShowLockdown() {

        mGlobalActionsDialogLite = spy(mGlobalActionsDialogLite);

        doReturn(4).when(mGlobalActionsDialogLite).getMaxShownPowerItems();

        doReturn(true).when(mGlobalActionsDialogLite).shouldDisplayEmergency();

        // make sure lockdown action will NOT be shown

        doReturn(false).when(mGlobalActionsDialogLite).shouldDisplayLockdown(any());

        doReturn(true).when(mGlobalActionsDialogLite).shouldShowAction(any());

        String[] actions = {

                GlobalActionsDialogLite.GLOBAL_ACTION_KEY_EMERGENCY,

                // lockdown action not allowed
@@ -385,6 +388,32 @@ public class GlobalActionsDialogLiteTest extends SysuiTestCase { 
        assertThat(mGlobalActionsDialogLite.mPowerItems).isEmpty();

    }



    @Test

    public void testCreateActionItems_emergencyDisabled_doesNotShowEmergency() {

        mGlobalActionsDialogLite = spy(mGlobalActionsDialogLite);

        doReturn(4).when(mGlobalActionsDialogLite).getMaxShownPowerItems();

        // make sure emergency action will NOT be shown

        doReturn(false).when(mGlobalActionsDialogLite).shouldDisplayEmergency();

        doReturn(true).when(mGlobalActionsDialogLite).shouldDisplayLockdown(any());

        doReturn(true).when(mGlobalActionsDialogLite).shouldShowAction(any());

        String[] actions = {

                // emergency action not allowed

                GlobalActionsDialogLite.GLOBAL_ACTION_KEY_EMERGENCY,

                GlobalActionsDialogLite.GLOBAL_ACTION_KEY_LOCKDOWN,

                GlobalActionsDialogLite.GLOBAL_ACTION_KEY_POWER,

                GlobalActionsDialogLite.GLOBAL_ACTION_KEY_RESTART,

        };

        doReturn(actions).when(mGlobalActionsDialogLite).getDefaultActions();

        mGlobalActionsDialogLite.createActionItems();



        assertItemsOfType(mGlobalActionsDialogLite.mItems,

                GlobalActionsDialogLite.LockDownAction.class,

                GlobalActionsDialogLite.ShutDownAction.class,

                GlobalActionsDialogLite.RestartAction.class);

        assertThat(mGlobalActionsDialogLite.mOverflowItems).isEmpty();

        assertThat(mGlobalActionsDialogLite.mPowerItems).isEmpty();

    }



    @Test

    public void testShouldLogLockdownPress() {

        GlobalActionsDialogLite.LockDownAction lockDownAction =