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

Commit e1fc69e1 authored by Nadav Bar's avatar Nadav Bar Committed by android-build-merger
Browse files

Merge "Use per user method when writing or reading Live Caption secure setting" into qt-r1-dev 

am: 5191f057

Change-Id: I3383332dbccb05770a582b351278e6a855a84173
parents 4091b07f 5191f057

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogControllerImpl.java

+5 −4
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.os.VibrationEffect;

import android.os.Vibrator;

import android.provider.Settings;
@@ -272,14 +273,14 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa 
    }



    public boolean areCaptionsEnabled() {

        int currentValue = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.ODI_CAPTIONS_ENABLED, 0);

        int currentValue = Settings.Secure.getIntForUser(mContext.getContentResolver(),

                Settings.Secure.ODI_CAPTIONS_ENABLED, 0, UserHandle.USER_CURRENT);

        return currentValue == 1;

    }



    public void setCaptionsEnabled(boolean isEnabled) {

        Settings.Secure.putInt(mContext.getContentResolver(),

                Settings.Secure.ODI_CAPTIONS_ENABLED, isEnabled ? 1 : 0);

        Settings.Secure.putIntForUser(mContext.getContentResolver(),

                Settings.Secure.ODI_CAPTIONS_ENABLED, isEnabled ? 1 : 0, UserHandle.USER_CURRENT);

    }



    @Override