PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not let guest user disable secuer nfc via SettingsSlice" into qt-dev am: 2f184b0ff4

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

Change-Id: Ia3a38063419fccfc6e1be8135180a3a433ebbd23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-02 07:15:36 +00:00
committed by Automerger Merge Worker
parent c2bb599eeb 2f184b0ff4
commit e3bbadb7df
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/nfc/SecureNfcPreferenceController.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.nfc;
import android.content.Context; import android.content.Context;
import android.nfc.NfcAdapter; import android.nfc.NfcAdapter;
import android.os.UserManager;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreference;
@@ -32,10 +33,12 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
public static final String KEY_SECURENFC_SETTINGS = "nfc_secure_settings"; public static final String KEY_SECURENFC_SETTINGS = "nfc_secure_settings";
private final NfcAdapter mNfcAdapter; private final NfcAdapter mNfcAdapter;
private SecureNfcEnabler mSecureNfcEnabler; private SecureNfcEnabler mSecureNfcEnabler;
private final UserManager mUserManager;
public SecureNfcPreferenceController(Context context, String key) { public SecureNfcPreferenceController(Context context, String key) {
super(context, key); super(context, key);
mNfcAdapter = NfcAdapter.getDefaultAdapter(context); mNfcAdapter = NfcAdapter.getDefaultAdapter(context);
mUserManager = context.getSystemService(UserManager.class);
} }
@Override @Override
@@ -58,7 +61,11 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
@Override @Override
public boolean setChecked(boolean isChecked) { public boolean setChecked(boolean isChecked) {
return mNfcAdapter.enableSecureNfc(isChecked); if (isToggleable()) {
return mNfcAdapter.enableSecureNfc(isChecked);
} else {
return false;
}
} }
@Override @Override
@@ -95,4 +102,12 @@ public class SecureNfcPreferenceController extends TogglePreferenceController
mSecureNfcEnabler.pause(); mSecureNfcEnabler.pause();
} }
} }
private boolean isToggleable() {
if (mUserManager.isGuestUser()) {
return false;
}
return true;
}
} }