Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4 am: e3bbadb7df am: 6fd7cf1993 am: 165c11c0da am: 2e68c87afc

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

Change-Id: Iea8346aa727c8ca1b9ccf7511e4c360c559c94c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-02 08:40:00 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
@@ -31,10 +32,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
@@ -57,7 +60,11 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
@Override
public boolean setChecked(boolean isChecked) {
return mNfcAdapter.enableSecureNfc(isChecked);
if (isToggleable()) {
return mNfcAdapter.enableSecureNfc(isChecked);
} else {
return false;
}
}
@Override
@@ -94,4 +101,12 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
mSecureNfcEnabler.pause();
}
}
private boolean isToggleable() {
if (mUserManager.isGuestUser()) {
return false;
}
return true;
}
}