Android/packages_apps_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)) {
return UNSUPPORTED_ON_DEVICE;
}
if (!mUserManager.isAdminUser()) {
if (mUserManager.isGuestUser()) {
return DISABLED_FOR_USER;
}
if (mNfcAdapter == null) {