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

Commit 1625a464 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix use of deprecated SoundPool API in Keyguard"

parents c9c983cd 0616db47

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+9 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.pm.UserInfo;

import android.hardware.biometrics.BiometricSourceType;

import android.media.AudioAttributes;

import android.media.AudioManager;

import android.media.SoundPool;

import android.os.Bundle;
@@ -750,7 +751,14 @@ public class KeyguardViewMediator extends SystemUI { 


        mDeviceInteractive = mPM.isInteractive();



        mLockSounds = new SoundPool(1, AudioManager.STREAM_SYSTEM, 0);

        mLockSounds = new SoundPool.Builder()

                .setMaxStreams(1)

                .setAudioAttributes(

                        new AudioAttributes.Builder()

                                .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)

                                .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)

                                .build())

                .build();

        String soundPath = Settings.Global.getString(cr, Settings.Global.LOCK_SOUND);

        if (soundPath != null) {

            mLockSoundId = mLockSounds.load(soundPath, 1);