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

am: e1fc69e125

Change-Id: I61ae1b71336b11465633c487061f007ae8f703f9
This commit is contained in:
Nadav Bar
2019-07-29 07:40:35 -07:00
committed by android-build-merger

View File

@@ -43,6 +43,7 @@ import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.UserHandle;
import android.os.VibrationEffect; import android.os.VibrationEffect;
import android.os.Vibrator; import android.os.Vibrator;
import android.provider.Settings; import android.provider.Settings;
@@ -272,14 +273,14 @@ public class VolumeDialogControllerImpl implements VolumeDialogController, Dumpa
} }
public boolean areCaptionsEnabled() { public boolean areCaptionsEnabled() {
int currentValue = Settings.Secure.getInt(mContext.getContentResolver(), int currentValue = Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.ODI_CAPTIONS_ENABLED, 0); Settings.Secure.ODI_CAPTIONS_ENABLED, 0, UserHandle.USER_CURRENT);
return currentValue == 1; return currentValue == 1;
} }
public void setCaptionsEnabled(boolean isEnabled) { public void setCaptionsEnabled(boolean isEnabled) {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putIntForUser(mContext.getContentResolver(),
Settings.Secure.ODI_CAPTIONS_ENABLED, isEnabled ? 1 : 0); Settings.Secure.ODI_CAPTIONS_ENABLED, isEnabled ? 1 : 0, UserHandle.USER_CURRENT);
} }
@Override @Override