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

Commit 6eb3f3bf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support multi-users for NFC payments" am: 6eb702ed 

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

Change-Id: I1f20e829bf513d8166458e1749bcc8c9fade07b2
parents 7d646a51 6eb702ed

src/com/android/settings/applications/specialaccess/DefaultPaymentSettingsPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {

src/com/android/settings/nfc/PaymentBackend.java

+9 −8
Original line number Diff line number Diff line
@@ -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();

    }