Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c (0797feaf) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -2119,6 +2119,10 @@
		<!-- Nfc developer settings: The description of the setting. -->
		<string name="nfc_stack_debuglog_summary">Increase NFC stack logging level</string>

		<!-- Nfc developer settings: The title of the setting to enable nfc verbose vendor log. [CHAR LIMIT=60] -->
		<string name="nfc_verbose_vendor_log_title">NFC verbose vendor debug log</string>
		<!-- Nfc developer settings: The description of the setting to enable nfc verbose vendor log. [CHAR_LIMIT=NONE] -->
		<string name="nfc_verbose_vendor_log_summary">Include additional device-specific vendor logs in bugreports, which may contain private information. </string>
		<!-- Nfc developer settings: The title of the setting to enable full nfc snoop log. [CHAR LIMIT=60] -->
		<string name="nfc_snoop_log_title">NFC NCI unfiltered snoop log</string>
		<!-- Nfc developer settings: The description of the setting to enable full nfc snoop log. [CHAR_LIMIT=NONE] -->

res/xml/development_settings.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -422,6 +422,11 @@
		android:title="@string/nfc_stack_debuglog_title"
		android:summary="@string/nfc_stack_debuglog_summary" />

		<SwitchPreference
		android:key="nfc_verbose_vendor_log"
		android:title="@string/nfc_verbose_vendor_log_title"
		android:summary="@string/nfc_verbose_vendor_log_summary" />

		<SwitchPreference
		android:key="nfc_snoop_log"
		android:title="@string/nfc_snoop_log_title"

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -417,6 +417,10 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		final NfcSnoopLogPreferenceController controller =
		getDevelopmentOptionsController(NfcSnoopLogPreferenceController.class);
		controller.onNfcRebootDialogConfirmed();

		final NfcVerboseVendorLogPreferenceController vendorLogController =
		getDevelopmentOptionsController(NfcVerboseVendorLogPreferenceController.class);
		vendorLogController.onNfcRebootDialogConfirmed();
		}

		@Override
		@@ -424,6 +428,10 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		final NfcSnoopLogPreferenceController controller =
		getDevelopmentOptionsController(NfcSnoopLogPreferenceController.class);
		controller.onNfcRebootDialogCanceled();

		final NfcVerboseVendorLogPreferenceController vendorLogController =
		getDevelopmentOptionsController(NfcVerboseVendorLogPreferenceController.class);
		vendorLogController.onNfcRebootDialogCanceled();
		}

		@Override
		@@ -591,6 +599,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
		controllers.add(new NfcStackDebugLogPreferenceController(context));
		controllers.add(new NfcSnoopLogPreferenceController(context, fragment));
		controllers.add(new NfcVerboseVendorLogPreferenceController(context, fragment));
		controllers.add(new ShowTapsPreferenceController(context));
		controllers.add(new PointerLocationPreferenceController(context));
		controllers.add(new ShowSurfaceUpdatesPreferenceController(context));

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

0 → 100644

+130 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settings.development;

		import android.content.Context;
		import android.os.SystemProperties;
		import android.util.Log;

		import androidx.annotation.VisibleForTesting;
		import androidx.preference.Preference;
		import androidx.preference.SwitchPreference;

		import com.android.settingslib.development.DeveloperOptionsPreferenceController;

		/**
		* Preference controller to control NFC vendor verbose logging enable and disable
		*/
		public class NfcVerboseVendorLogPreferenceController
		extends DeveloperOptionsPreferenceController
		implements Preference.OnPreferenceChangeListener {
		private static final String TAG = "NfcVerboseVendorLog";
		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";
		@VisibleForTesting
		static final String VERBOSE_VENDOR_LOG_ENABLED = "enabled";
		@VisibleForTesting
		static final String VERBOSE_VENDOR_LOG_DISABLED = "disabled";

		@VisibleForTesting
		boolean mChanged = false;

		private final DevelopmentSettingsDashboardFragment mFragment;

		public NfcVerboseVendorLogPreferenceController(Context context,
		DevelopmentSettingsDashboardFragment fragment) {
		super(context);
		mFragment = fragment;
		}

		@Override
		public String getPreferenceKey() {
		return NFC_VERBOSE_VENDOR_LOG_KEY;
		}

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		NfcRebootDialog.show(mFragment);
		mChanged = true;
		return false;
		}

		@Override
		public void updateState(Preference preference) {
		try {
		final String currentValue = SystemProperties.get(NFC_VERBOSE_VENDOR_LOG_PROPERTY);
		((SwitchPreference) mPreference)
		.setChecked(currentValue.equals(VERBOSE_VENDOR_LOG_ENABLED));
		} catch (RuntimeException e) {
		Log.e(TAG, "Fail to get nfc system property: " + e.getMessage());
		}
		}

		@Override
		protected void onDeveloperOptionsSwitchDisabled() {
		super.onDeveloperOptionsSwitchDisabled();
		try {
		SystemProperties.set(NFC_VERBOSE_VENDOR_LOG_PROPERTY, VERBOSE_VENDOR_LOG_DISABLED);
		((SwitchPreference) mPreference).setChecked(false);
		} catch (RuntimeException e) {
		Log.e(TAG, "Fail to set nfc system property: " + e.getMessage());
		}
		}

		/**
		* Check whether the current setting is the default value or not.
		*/
		public boolean isDefaultValue() {
		try {
		final String currentValue = SystemProperties.get(NFC_VERBOSE_VENDOR_LOG_PROPERTY);
		return !currentValue.equals(VERBOSE_VENDOR_LOG_ENABLED);
		} catch (RuntimeException e) {
		Log.e(TAG, "Fail to get nfc system property: " + e.getMessage());
		}
		return true;
		}

		/**
		* Called when the NfcRebootDialog confirm is clicked.
		*/
		public void onNfcRebootDialogConfirmed() {
		if (!mChanged) {
		return;
		}
		try {
		final String currentValue = SystemProperties
		.get(NFC_VERBOSE_VENDOR_LOG_PROPERTY, VERBOSE_VENDOR_LOG_DISABLED);
		if (currentValue.equals(VERBOSE_VENDOR_LOG_DISABLED)) {
		SystemProperties.set(NFC_VERBOSE_VENDOR_LOG_PROPERTY, VERBOSE_VENDOR_LOG_ENABLED);
		} else {
		SystemProperties.set(NFC_VERBOSE_VENDOR_LOG_PROPERTY, VERBOSE_VENDOR_LOG_DISABLED);
		}
		updateState(mPreference);
		} catch (RuntimeException e) {
		Log.e(TAG, "Fail to set nfc system property: " + e.getMessage());
		}
		}

		/**
		* Called when the NfcRebootDialog cancel is clicked.
		*/
		public void onNfcRebootDialogCanceled() {
		mChanged = false;
		}
		}