PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support multi-users for NFC payments" am: 6eb702ed63 am: 6eb3f3bf90 am: fb1bf5f85e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405

Change-Id: I11c518f21390017a8aa93e8c201ecc3da752b5c1
This commit is contained in:
Treehugger Robot
2021-09-02 09:38:25 +00:00
committed by Automerger Merge Worker
parent 2d827ddf50 fb1bf5f85e
commit e81eb6bd40
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/applications/specialaccess/DefaultPaymentSettingsPreferenceController.java
View File

@@ -82,7 +82,7 @@ public class DefaultPaymentSettingsPreferenceController extends BasePreferenceCo
PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
return UNSUPPORTED_ON_DEVICE;
}
if (!mUserManager.isAdminUser()) {
if (mUserManager.isGuestUser()) {
return DISABLED_FOR_USER;
}
if (mNfcAdapter == null) {

17
src/com/android/settings/nfc/PaymentBackend.java
View File

@@ -28,6 +28,7 @@ import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException;
@@ -141,21 +142,21 @@ public class PaymentBackend {
boolean isForegroundMode() {
try {
return Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.NFC_PAYMENT_FOREGROUND) != 0;
return Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.NFC_PAYMENT_FOREGROUND, UserHandle.myUserId()) != 0;
} catch (SettingNotFoundException e) {
return false;
}
}
void setForegroundMode(boolean foreground) {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.NFC_PAYMENT_FOREGROUND, foreground ? 1 : 0);
Settings.Secure.putIntForUser(mContext.getContentResolver(),
Settings.Secure.NFC_PAYMENT_FOREGROUND, foreground ? 1 : 0, UserHandle.myUserId());
}
ComponentName getDefaultPaymentApp() {
String componentString = Settings.Secure.getString(mContext.getContentResolver(),
Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT);
String componentString = Settings.Secure.getStringForUser(mContext.getContentResolver(),
Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT, UserHandle.myUserId());
if (componentString != null) {
return ComponentName.unflattenFromString(componentString);
} else {
@@ -164,9 +165,9 @@ public class PaymentBackend {
}
public void setDefaultPaymentApp(ComponentName app) {
Settings.Secure.putString(mContext.getContentResolver(),
Settings.Secure.putStringForUser(mContext.getContentResolver(),
Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,
app != null ? app.flattenToString() : null);
app != null ? app.flattenToString() : null, UserHandle.myUserId());
refresh();
}