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

Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be

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

Change-Id: Ibbe1f8ed19c421b32f24675734eeb233b61e5468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Henri Chataing
2023-02-24 23:02:43 +00:00
committed by Automerger Merge Worker
parent 159b42a247 fa88ad84be
commit 1325de7875
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/development/NfcSnoopLogPreferenceController.java
View File

@@ -36,7 +36,7 @@ public class NfcSnoopLogPreferenceController extends
"nfc_snoop_log"; "nfc_snoop_log";
@VisibleForTesting @VisibleForTesting
static final String NFC_NFCSNOOP_LOG_MODE_PROPERTY = static final String NFC_NFCSNOOP_LOG_MODE_PROPERTY =
"persist.nfc.nfcsnooplogmode"; "persist.nfc.snoop_log_mode";
@VisibleForTesting @VisibleForTesting
static final String NFCSNOOP_MODE_FILTERED = "filtered"; static final String NFCSNOOP_MODE_FILTERED = "filtered";
@VisibleForTesting @VisibleForTesting

6
src/com/android/settings/development/NfcVerboseVendorLogPreferenceController.java
View File

@@ -36,11 +36,11 @@ public class NfcVerboseVendorLogPreferenceController
private static final String NFC_VERBOSE_VENDOR_LOG_KEY = "nfc_verbose_vendor_log"; private static final String NFC_VERBOSE_VENDOR_LOG_KEY = "nfc_verbose_vendor_log";
@VisibleForTesting @VisibleForTesting
static final String NFC_VERBOSE_VENDOR_LOG_PROPERTY = static final String NFC_VERBOSE_VENDOR_LOG_PROPERTY =
"persist.nfc.verbosevendorlog"; "persist.nfc.vendor_debug_enabled";
@VisibleForTesting @VisibleForTesting
static final String VERBOSE_VENDOR_LOG_ENABLED = "enabled"; static final String VERBOSE_VENDOR_LOG_ENABLED = "true";
@VisibleForTesting @VisibleForTesting
static final String VERBOSE_VENDOR_LOG_DISABLED = "disabled"; static final String VERBOSE_VENDOR_LOG_DISABLED = "false";
@VisibleForTesting @VisibleForTesting
boolean mChanged = false; boolean mChanged = false;