Merge "Support multi-users for NFC payments" (6eb702ed) · Commits · e / os / android_packages_apps_Settings

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();
		}