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

Commit 85f52415 authored by Beverly's avatar Beverly
Browse files

Keep ringer changes in priority only dnd 

Test: runtest -x frameworks/base/services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java
Change-Id: I9ae4d90d143853257a883f739b57ef32b823367d
Fixes: 73785184
parent 2b298894

services/core/java/com/android/server/notification/ZenModeHelper.java

+12 −12
Original line number Original line Diff line number Diff line
@@ -107,7 +107,7 @@ public class ZenModeHelper { 
    @VisibleForTesting protected int mZenMode;

    @VisibleForTesting protected int mZenMode;

    private int mUser = UserHandle.USER_SYSTEM;

    private int mUser = UserHandle.USER_SYSTEM;

    @VisibleForTesting protected ZenModeConfig mConfig;

    @VisibleForTesting protected ZenModeConfig mConfig;

    private AudioManagerInternal mAudioManager;

    @VisibleForTesting protected AudioManagerInternal mAudioManager;

    protected PackageManager mPm;

    protected PackageManager mPm;

    private long mSuppressedEffects;

    private long mSuppressedEffects;
@@ -886,7 +886,8 @@ public class ZenModeHelper { 
                exceptionPackages);

                exceptionPackages);

    }

    }





    private void applyZenToRingerMode() {

    @VisibleForTesting

    protected void applyZenToRingerMode() {

        if (mAudioManager == null) return;

        if (mAudioManager == null) return;

        // force the ringer mode into compliance

        // force the ringer mode into compliance

        final int ringerModeInternal = mAudioManager.getRingerModeInternal();

        final int ringerModeInternal = mAudioManager.getRingerModeInternal();
@@ -901,16 +902,9 @@ public class ZenModeHelper { 
                break;

                break;

            case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:

            case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:

                if (ZenModeConfig.areAllPriorityOnlyNotificationZenSoundsMuted(mConfig)) {

                if (ZenModeConfig.areAllPriorityOnlyNotificationZenSoundsMuted(mConfig)) {

                    if (ringerModeInternal != AudioManager.RINGER_MODE_SILENT) {

                    setPreviousRingerModeSetting(ringerModeInternal);

                    setPreviousRingerModeSetting(ringerModeInternal);

                    newRingerModeInternal = AudioManager.RINGER_MODE_SILENT;

                    newRingerModeInternal = AudioManager.RINGER_MODE_SILENT;

                }

                }

                } else {

                    if (ringerModeInternal == AudioManager.RINGER_MODE_SILENT) {

                        newRingerModeInternal = getPreviousRingerModeSetting();

                        setPreviousRingerModeSetting(null);

                    }

                }

                break;

                break;

            case Global.ZEN_MODE_OFF:

            case Global.ZEN_MODE_OFF:

                if (ringerModeInternal == AudioManager.RINGER_MODE_SILENT) {

                if (ringerModeInternal == AudioManager.RINGER_MODE_SILENT) {
@@ -1003,7 +997,8 @@ public class ZenModeHelper { 
        }

        }

    }

    }





    private final class RingerModeDelegate implements AudioManagerInternal.RingerModeDelegate {

    @VisibleForTesting

    protected final class RingerModeDelegate implements AudioManagerInternal.RingerModeDelegate {

        @Override

        @Override

        public String toString() {

        public String toString() {

            return TAG;

            return TAG;
@@ -1040,9 +1035,14 @@ public class ZenModeHelper { 
                    }

                    }

                    break;

                    break;

            }

            }



            if (newZen != -1) {

            if (newZen != -1) {

                setManualZenMode(newZen, null, "ringerModeInternal", null,

                setManualZenMode(newZen, null, "ringerModeInternal", null,

                        false /*setRingerMode*/);

                        false /*setRingerMode*/);

            } else if (mZenMode == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS

                    && !ZenModeConfig.areAllPriorityOnlyNotificationZenSoundsMuted(mConfig)) {

                // in priority only with ringer not muted, save ringer mode changes

                setPreviousRingerModeSetting(ringerModeNew);

            }

            }





            if (isChange || newZen != -1 || ringerModeExternal != ringerModeExternalOut) {

            if (isChange || newZen != -1 || ringerModeExternal != ringerModeExternalOut) {

services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java

+121 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.ArgumentMatchers.anyInt; 
import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.atLeastOnce;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.times;
@@ -37,7 +38,12 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.Context;

import android.content.res.Resources;

import android.content.res.Resources;

import android.media.AudioAttributes;

import android.media.AudioAttributes;

import android.media.AudioManager;

import android.media.AudioManagerInternal;

import android.media.VolumePolicy;

import android.provider.Settings;

import android.provider.Settings;

import android.provider.Settings.Global;

import android.service.notification.ZenModeConfig;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.SmallTest;

import android.testing.AndroidTestingRunner;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.testing.TestableLooper;
@@ -241,4 +247,119 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
        verify(mNotificationManager, never()).notify(eq(ZenModeHelper.TAG),

        verify(mNotificationManager, never()).notify(eq(ZenModeHelper.TAG),

                eq(SystemMessage.NOTE_ZEN_UPGRADE), any());

                eq(SystemMessage.NOTE_ZEN_UPGRADE), any());

    }

    }



    @Test

    public void testZenSetInternalRinger_AllPriorityNotificationSoundsMuted() {

        AudioManagerInternal mAudioManager = mock(AudioManagerInternal.class);

        mZenModeHelperSpy.mAudioManager = mAudioManager;

        Global.putString(mContext.getContentResolver(), Global.ZEN_MODE_RINGER_LEVEL,

                Integer.toString(AudioManager.RINGER_MODE_NORMAL));



        // 1. Current ringer is normal

        when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_NORMAL);

        // Set zen to priority-only with all notification sounds muted (so ringer will be muted)

        mZenModeHelperSpy.mZenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        mZenModeHelperSpy.mConfig.allowReminders = false;

        mZenModeHelperSpy.mConfig.allowCalls = false;

        mZenModeHelperSpy.mConfig.allowMessages = false;

        mZenModeHelperSpy.mConfig.allowEvents = false;

        mZenModeHelperSpy.mConfig.allowRepeatCallers= false;



        // 2. apply priority only zen - verify ringer is set to silent

        mZenModeHelperSpy.applyZenToRingerMode();

        verify(mAudioManager, atLeastOnce()).setRingerModeInternal(AudioManager.RINGER_MODE_SILENT,

                mZenModeHelperSpy.TAG);



        // 3. apply zen off - verify zen is set to prevoius ringer (normal)

        when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_SILENT);

        mZenModeHelperSpy.mZenMode = Global.ZEN_MODE_OFF;

        mZenModeHelperSpy.applyZenToRingerMode();

        verify(mAudioManager, atLeastOnce()).setRingerModeInternal(AudioManager.RINGER_MODE_NORMAL,

                mZenModeHelperSpy.TAG);

    }



    @Test

    public void testZenSetInternalRinger_NotAllPriorityNotificationSoundsMuted_StartNormal() {

        AudioManagerInternal mAudioManager = mock(AudioManagerInternal.class);

        mZenModeHelperSpy.mAudioManager = mAudioManager;

        Global.putString(mContext.getContentResolver(), Global.ZEN_MODE_RINGER_LEVEL,

                Integer.toString(AudioManager.RINGER_MODE_NORMAL));



        // 1. Current ringer is normal

        when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_NORMAL);

        mZenModeHelperSpy.mZenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        mZenModeHelperSpy.mConfig.allowReminders = true;



        // 2. apply priority only zen - verify ringer is normal

        mZenModeHelperSpy.applyZenToRingerMode();

        verify(mAudioManager, atLeastOnce()).setRingerModeInternal(AudioManager.RINGER_MODE_NORMAL,

                mZenModeHelperSpy.TAG);



        // 3.  apply zen off - verify ringer remains normal

        when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_NORMAL);

        mZenModeHelperSpy.mZenMode = Global.ZEN_MODE_OFF;

        mZenModeHelperSpy.applyZenToRingerMode();

        verify(mAudioManager, atLeastOnce()).setRingerModeInternal(AudioManager.RINGER_MODE_NORMAL,

                mZenModeHelperSpy.TAG);

    }



    @Test

    public void testZenSetInternalRinger_NotAllPriorityNotificationSoundsMuted_StartSilent() {

        AudioManagerInternal mAudioManager = mock(AudioManagerInternal.class);

        mZenModeHelperSpy.mAudioManager = mAudioManager;

        Global.putString(mContext.getContentResolver(), Global.ZEN_MODE_RINGER_LEVEL,

                Integer.toString(AudioManager.RINGER_MODE_SILENT));



        // 1. Current ringer is silent

        when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_SILENT);

        mZenModeHelperSpy.mZenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        mZenModeHelperSpy.mConfig.allowReminders = true;



        // 2. apply priority only zen - verify ringer is silent

        mZenModeHelperSpy.applyZenToRingerMode();

        verify(mAudioManager, atLeastOnce()).setRingerModeInternal(AudioManager.RINGER_MODE_SILENT,

                mZenModeHelperSpy.TAG);



        // 3. apply zen-off - verify ringer is still silent

        when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_SILENT);

        mZenModeHelperSpy.mZenMode = Global.ZEN_MODE_OFF;

        mZenModeHelperSpy.applyZenToRingerMode();

        verify(mAudioManager, atLeastOnce()).setRingerModeInternal(AudioManager.RINGER_MODE_SILENT,

                mZenModeHelperSpy.TAG);

    }



    @Test

    public void testZenSetInternalRinger_NotAllPriorityNotificationSoundsMuted_RingerChanges() {

        AudioManagerInternal mAudioManager = mock(AudioManagerInternal.class);

        mZenModeHelperSpy.mAudioManager = mAudioManager;

        Global.putString(mContext.getContentResolver(), Global.ZEN_MODE_RINGER_LEVEL,

                Integer.toString(AudioManager.RINGER_MODE_NORMAL));



        // 1. Current ringer is normal

        when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_NORMAL);

        // Set zen to priority-only with all notification sounds muted (so ringer will be muted)

        mZenModeHelperSpy.mZenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

        mZenModeHelperSpy.mConfig.allowReminders = true;



        // 2. apply priority only zen - verify zen will still be normal

        mZenModeHelperSpy.applyZenToRingerMode();

        verify(mAudioManager, atLeastOnce()).setRingerModeInternal(AudioManager.RINGER_MODE_NORMAL,

                mZenModeHelperSpy.TAG);



        // 3. change ringer from normal to silent, verify previous ringer set to new rigner (silent)

        ZenModeHelper.RingerModeDelegate ringerModeDelegate =

                mZenModeHelperSpy.new RingerModeDelegate();

        ringerModeDelegate.onSetRingerModeInternal(AudioManager.RINGER_MODE_NORMAL,

                AudioManager.RINGER_MODE_SILENT, "test", AudioManager.RINGER_MODE_NORMAL,

                VolumePolicy.DEFAULT);

        assertEquals(AudioManager.RINGER_MODE_SILENT, Global.getInt(mContext.getContentResolver(),

                Global.ZEN_MODE_RINGER_LEVEL, AudioManager.RINGER_MODE_NORMAL));



        // 4.  apply zen off - verify ringer still silenced

        when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_SILENT);

        mZenModeHelperSpy.mZenMode = Global.ZEN_MODE_OFF;

        mZenModeHelperSpy.applyZenToRingerMode();

        verify(mAudioManager, atLeastOnce()).setRingerModeInternal(AudioManager.RINGER_MODE_SILENT,

                mZenModeHelperSpy.TAG);

    }

}
 
}