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

Commit fa88ad84 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "Nfc: Rename system properties in Nfc settings"

parents 60763d69 b2e4e3c8

src/com/android/settings/development/NfcSnoopLogPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public class NfcSnoopLogPreferenceController extends 
            "nfc_snoop_log";

    @VisibleForTesting

    static final String NFC_NFCSNOOP_LOG_MODE_PROPERTY =

            "persist.nfc.nfcsnooplogmode";

            "persist.nfc.snoop_log_mode";

    @VisibleForTesting

    static final String NFCSNOOP_MODE_FILTERED = "filtered";

    @VisibleForTesting

src/com/android/settings/development/NfcVerboseVendorLogPreferenceController.java

+3 −3
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ public class NfcVerboseVendorLogPreferenceController 
    private static final String NFC_VERBOSE_VENDOR_LOG_KEY = "nfc_verbose_vendor_log";

    @VisibleForTesting

    static final String NFC_VERBOSE_VENDOR_LOG_PROPERTY =

            "persist.nfc.verbosevendorlog";

            "persist.nfc.vendor_debug_enabled";

    @VisibleForTesting

    static final String VERBOSE_VENDOR_LOG_ENABLED = "enabled";

    static final String VERBOSE_VENDOR_LOG_ENABLED = "true";

    @VisibleForTesting

    static final String VERBOSE_VENDOR_LOG_DISABLED = "disabled";

    static final String VERBOSE_VENDOR_LOG_DISABLED = "false";



    @VisibleForTesting

    boolean mChanged = false;