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

Commit a312bc1b authored by Lais Andrade's avatar Lais Andrade
Browse files

Fix VibrationSettings to handle missing AudioManager 

Update VibrationSettings to handle devices that do not provide
AudioManager service.

Fix: 380022127
Flag: EXEMPT small bugfix
Test: VibrationSettingsTest
Change-Id: I5db3f6b99224c335109e83312fd6bc6252d23392
Merged-In: I5db3f6b99224c335109e83312fd6bc6252d23392
(cherry picked from commit e61fd381)
parent 43c7b2fa

services/core/java/com/android/server/vibrator/VibrationSettings.java

+4 −4
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ final class VibrationSettings { 
    @GuardedBy("mLock")

    private boolean mVibrateOn;

    @GuardedBy("mLock")

    private int mRingerMode;

    private int mRingerMode = AudioManager.RINGER_MODE_NORMAL;

    @GuardedBy("mLock")

    private boolean mOnWirelessCharger;
@@ -235,7 +235,7 @@ final class VibrationSettings { 
    public void onSystemReady() {

        PowerManagerInternal pm = LocalServices.getService(PowerManagerInternal.class);

        AudioManager am = mContext.getSystemService(AudioManager.class);

        int ringerMode = am.getRingerModeInternal();

        int ringerMode = (am == null) ? mRingerMode : am.getRingerModeInternal();



        synchronized (mLock) {

            mPowerManagerInternal = pm;
@@ -615,10 +615,10 @@ final class VibrationSettings { 


    private void updateRingerMode() {

        synchronized (mLock) {

            // If audio manager was not loaded yet then assume most restrictive mode.

            // If audio manager was not loaded yet then assume normal mode.

            // This will be loaded again as soon as the audio manager is loaded in onSystemReady.

            mRingerMode = (mAudioManager == null)

                    ? AudioManager.RINGER_MODE_SILENT

                    ? AudioManager.RINGER_MODE_NORMAL

                    : mAudioManager.getRingerModeInternal();

        }

    }

services/tests/vibrator/src/com/android/server/vibrator/VibrationSettingsTest.java

+10 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ public class VibrationSettingsTest { 
        removeServicesForTest();

        LocalServices.addService(PowerManagerInternal.class, mPowerManagerInternalMock);

        LocalServices.addService(PackageManagerInternal.class, mPackageManagerInternalMock);

        when(mContextSpy.getSystemService(eq(Context.AUDIO_SERVICE))).thenReturn(null);



        VibrationSettings minimalVibrationSettings = new VibrationSettings(mContextSpy,

                new Handler(mTestLooper.getLooper()), mVibrationConfigMock);
@@ -463,6 +464,15 @@ public class VibrationSettingsTest { 
        }

    }



    @Test

    public void shouldIgnoreVibration_withoutAudioManager_allowsAllVibrations() {

        when(mContextSpy.getSystemService(eq(Context.AUDIO_SERVICE))).thenReturn(null);

        createSystemReadyVibrationSettings();



        for (int usage : ALL_USAGES) {

            assertVibrationNotIgnoredForUsage(usage);

        }

    }



    @Test

    public void shouldIgnoreVibration_vibrateOnDisabled_ignoresUsagesNotAccessibility() {