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

Commit e3bbadb7 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 am: 2f184b0f 

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



Change-Id: Ia3a38063419fccfc6e1be8135180a3a433ebbd23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2bb599e 2f184b0f

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

+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 
    public static final String KEY_SECURENFC_SETTINGS = "nfc_secure_settings";

    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
@@ -95,4 +102,12 @@ public class SecureNfcPreferenceController extends TogglePreferenceController 
            mSecureNfcEnabler.pause();

        }

    }



    private boolean isToggleable() {

        if (mUserManager.isGuestUser()) {

            return false;

        }

        return true;

    }



}