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

Commit b14288d4 authored by Jim Miller's avatar Jim Miller
Browse files

Attempt to fix missing lock sounds

bug 7254629

Change-Id: I65eee674fe014a0e84d5ec20ead81abdec38f890
parent 1f7a09b5
Loading
Loading
Loading
Loading
+6 −4
Original line number Original line Diff line number Diff line
@@ -1884,10 +1884,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {


        loadIntegerSetting(stmt, Settings.System.LOCKSCREEN_SOUNDS_ENABLED,
        loadIntegerSetting(stmt, Settings.System.LOCKSCREEN_SOUNDS_ENABLED,
            R.integer.def_lockscreen_sounds_enabled);
            R.integer.def_lockscreen_sounds_enabled);
        loadStringSetting(stmt, Settings.System.LOCK_SOUND,
            R.string.def_lock_sound);
        loadStringSetting(stmt, Settings.System.UNLOCK_SOUND,
            R.string.def_unlock_sound);
    }
    }


    private void loadDefaultAnimationSettings(SQLiteStatement stmt) {
    private void loadDefaultAnimationSettings(SQLiteStatement stmt) {
@@ -2103,6 +2099,12 @@ public class DatabaseHelper extends SQLiteOpenHelper {
            loadBooleanSetting(stmt, Settings.Global.WIFI_DISPLAY_ON,
            loadBooleanSetting(stmt, Settings.Global.WIFI_DISPLAY_ON,
                    R.bool.def_wifi_display_on);
                    R.bool.def_wifi_display_on);


            loadStringSetting(stmt, Settings.Global.LOCK_SOUND,
                    R.string.def_lock_sound);

            loadStringSetting(stmt, Settings.Global.UNLOCK_SOUND,
                    R.string.def_unlock_sound);

            // --- New global settings start here
            // --- New global settings start here
        } finally {
        } finally {
            if (stmt != null) stmt.close();
            if (stmt != null) stmt.close();
+4 −4
Original line number Original line Diff line number Diff line
@@ -482,19 +482,19 @@ public class KeyguardViewMediator {
        mScreenOn = mPM.isScreenOn();
        mScreenOn = mPM.isScreenOn();


        mLockSounds = new SoundPool(1, AudioManager.STREAM_SYSTEM, 0);
        mLockSounds = new SoundPool(1, AudioManager.STREAM_SYSTEM, 0);
        String soundPath = Settings.System.getString(cr, Settings.System.LOCK_SOUND);
        String soundPath = Settings.Global.getString(cr, Settings.Global.LOCK_SOUND);
        if (soundPath != null) {
        if (soundPath != null) {
            mLockSoundId = mLockSounds.load(soundPath, 1);
            mLockSoundId = mLockSounds.load(soundPath, 1);
        }
        }
        if (soundPath == null || mLockSoundId == 0) {
        if (soundPath == null || mLockSoundId == 0) {
            if (DEBUG) Log.d(TAG, "failed to load sound from " + soundPath);
            Log.w(TAG, "failed to load lock sound from " + soundPath);
        }
        }
        soundPath = Settings.System.getString(cr, Settings.System.UNLOCK_SOUND);
        soundPath = Settings.Global.getString(cr, Settings.Global.UNLOCK_SOUND);
        if (soundPath != null) {
        if (soundPath != null) {
            mUnlockSoundId = mLockSounds.load(soundPath, 1);
            mUnlockSoundId = mLockSounds.load(soundPath, 1);
        }
        }
        if (soundPath == null || mUnlockSoundId == 0) {
        if (soundPath == null || mUnlockSoundId == 0) {
            if (DEBUG) Log.d(TAG, "failed to load sound from " + soundPath);
            Log.w(TAG, "failed to load unlock sound from " + soundPath);
        }
        }
        int lockSoundDefaultAttenuation = context.getResources().getInteger(
        int lockSoundDefaultAttenuation = context.getResources().getInteger(
                com.android.internal.R.integer.config_lockSoundVolumeDb);
                com.android.internal.R.integer.config_lockSoundVolumeDb);