Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use public API of Settings.Secure to get/put secure settings" am: d7203652f7 am: dbb2d21bbb

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1463904

Change-Id: I007c12c13166e38181b5d45b9c106b8c1d832c91
This commit is contained in:
Treehugger Robot
2020-10-21 09:24:42 +00:00
committed by Automerger Merge Worker
parent 2920fb27af dbb2d21bbb
commit 93d09dde3a
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -38,6 +38,7 @@ import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -1976,28 +1977,33 @@ public class Vpn {
* @see Settings.Secure#putStringForUser
*/
public void settingsSecurePutStringForUser(String key, String value, int userId) {
Settings.Secure.putStringForUser(mContext.getContentResolver(), key, value, userId);
Settings.Secure.putString(getContentResolverAsUser(userId), key, value);
}
/**
* @see Settings.Secure#putIntForUser
*/
public void settingsSecurePutIntForUser(String key, int value, int userId) {
Settings.Secure.putIntForUser(mContext.getContentResolver(), key, value, userId);
Settings.Secure.putInt(getContentResolverAsUser(userId), key, value);
}
/**
* @see Settings.Secure#getStringForUser
*/
public String settingsSecureGetStringForUser(String key, int userId) {
return Settings.Secure.getStringForUser(mContext.getContentResolver(), key, userId);
return Settings.Secure.getString(getContentResolverAsUser(userId), key);
}
/**
* @see Settings.Secure#getIntForUser
*/
public int settingsSecureGetIntForUser(String key, int def, int userId) {
return Settings.Secure.getIntForUser(mContext.getContentResolver(), key, def, userId);
return Settings.Secure.getInt(getContentResolverAsUser(userId), key, def);
}
private ContentResolver getContentResolverAsUser(int userId) {
return mContext.createContextAsUser(
UserHandle.of(userId), 0 /* flags */).getContentResolver();
}
public boolean isCallerSystem() {