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

Commit e4a5991f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev...

Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0f am: e3bbadb7 am: 6fd7cf19 am: 165c11c0 am: 2e68c87a am: b2a6f3b6 am: e6ee0ba1 am: 1ef5a1c8 am: 3ff3ace8

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



Change-Id: I576c7d7e3d4b3c86e9f92838822d5ddda50bacf9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d025402 3ff3ace8
Loading
Loading
Loading
Loading
+16 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settings.nfc;

import android.content.Context;
import android.nfc.NfcAdapter;
import android.os.UserManager;

import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@@ -32,10 +33,12 @@ public class SecureNfcPreferenceController extends TogglePreferenceController

    private final NfcAdapter mNfcAdapter;
    private SecureNfcEnabler mSecureNfcEnabler;
    private final UserManager mUserManager;

    public SecureNfcPreferenceController(Context context, String key) {
        super(context, key);
        mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
        mUserManager = context.getSystemService(UserManager.class);
    }

    @Override
@@ -58,7 +61,11 @@ public class SecureNfcPreferenceController extends TogglePreferenceController

    @Override
    public boolean setChecked(boolean isChecked) {
        if (isToggleable()) {
            return mNfcAdapter.enableSecureNfc(isChecked);
        } else {
            return false;
        }
    }

    @Override
@@ -100,4 +107,12 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
            mSecureNfcEnabler.pause();
        }
    }

    private boolean isToggleable() {
        if (mUserManager.isGuestUser()) {
            return false;
        }
        return true;
    }

}