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 am: e81eb6bd40 am: bc3d304f1a

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

Change-Id: I5db1e2bb4b6e446f1866ea2f252359e588e5c28e
This commit is contained in:
Treehugger Robot
2021-09-02 10:01:09 +00:00
committed by Automerger Merge Worker
parent fa780e76e5 bc3d304f1a
commit ce4f483f56
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)) { PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
return UNSUPPORTED_ON_DEVICE; return UNSUPPORTED_ON_DEVICE;
} }
if (!mUserManager.isAdminUser()) { if (mUserManager.isGuestUser()) {
return DISABLED_FOR_USER; return DISABLED_FOR_USER;
} }
if (mNfcAdapter == null) { 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.Looper;
import android.os.Message; import android.os.Message;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException; import android.provider.Settings.SettingNotFoundException;
@@ -141,21 +142,21 @@ public class PaymentBackend {
boolean isForegroundMode() { boolean isForegroundMode() {
try { try {
return Settings.Secure.getInt(mContext.getContentResolver(), return Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.NFC_PAYMENT_FOREGROUND) != 0; Settings.Secure.NFC_PAYMENT_FOREGROUND, UserHandle.myUserId()) != 0;
} catch (SettingNotFoundException e) { } catch (SettingNotFoundException e) {
return false; return false;
} }
} }
void setForegroundMode(boolean foreground) { void setForegroundMode(boolean foreground) {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putIntForUser(mContext.getContentResolver(),
Settings.Secure.NFC_PAYMENT_FOREGROUND, foreground ? 1 : 0); Settings.Secure.NFC_PAYMENT_FOREGROUND, foreground ? 1 : 0, UserHandle.myUserId());
} }
ComponentName getDefaultPaymentApp() { ComponentName getDefaultPaymentApp() {
String componentString = Settings.Secure.getString(mContext.getContentResolver(), String componentString = Settings.Secure.getStringForUser(mContext.getContentResolver(),
Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT); Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT, UserHandle.myUserId());
if (componentString != null) { if (componentString != null) {
return ComponentName.unflattenFromString(componentString); return ComponentName.unflattenFromString(componentString);
} else { } else {
@@ -164,9 +165,9 @@ public class PaymentBackend {
} }
public void setDefaultPaymentApp(ComponentName app) { public void setDefaultPaymentApp(ComponentName app) {
Settings.Secure.putString(mContext.getContentResolver(), Settings.Secure.putStringForUser(mContext.getContentResolver(),
Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT, Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,
app != null ? app.flattenToString() : null); app != null ? app.flattenToString() : null, UserHandle.myUserId());
refresh(); refresh();
} }