Add a developer option to increase nfc stack log level
Easier to increase nfc stack log level. Bug: 187083201 Test: enable/disable from developer option and check nfc log Change-Id: I0675cbd535a2faf3b77b2842b03b7fb3b1b782fa
This commit is contained in:
@@ -1720,6 +1720,11 @@
|
|||||||
<!-- Bluetooth developer settings: Maximum number of connected audio devices -->
|
<!-- Bluetooth developer settings: Maximum number of connected audio devices -->
|
||||||
<string name="bluetooth_max_connected_audio_devices_dialog_title">Select maximum number of connected Bluetooth audio devices</string>
|
<string name="bluetooth_max_connected_audio_devices_dialog_title">Select maximum number of connected Bluetooth audio devices</string>
|
||||||
|
|
||||||
|
<!-- Nfc developer settings: Maximum number of connected audio devices -->
|
||||||
|
<string name="nfc_stack_debuglog_title">Enable Nfc stack debuglog</string>
|
||||||
|
<!-- Nfc developer settings: Maximum number of connected audio devices -->
|
||||||
|
<string name="nfc_stack_debuglog_summary">Increase Nfc stack logging level</string>
|
||||||
|
|
||||||
<!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
|
<!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
|
||||||
<string name="wifi_display_settings_title">Cast</string>
|
<string name="wifi_display_settings_title">Cast</string>
|
||||||
<!-- Wifi Display settings. The keywords of the setting. [CHAR LIMIT=NONE] -->
|
<!-- Wifi Display settings. The keywords of the setting. [CHAR LIMIT=NONE] -->
|
||||||
|
@@ -392,6 +392,11 @@
|
|||||||
android:entries="@array/bluetooth_max_connected_audio_devices"
|
android:entries="@array/bluetooth_max_connected_audio_devices"
|
||||||
android:entryValues="@array/bluetooth_max_connected_audio_devices_values" />
|
android:entryValues="@array/bluetooth_max_connected_audio_devices_values" />
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="nfc_stack_debuglog_enabled"
|
||||||
|
android:title="@string/nfc_stack_debuglog_title"
|
||||||
|
android:summary="@string/nfc_stack_debuglog_summary" />
|
||||||
|
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
|
@@ -516,6 +516,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new BluetoothMapVersionPreferenceController(context));
|
controllers.add(new BluetoothMapVersionPreferenceController(context));
|
||||||
controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
|
controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
|
||||||
controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
|
controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
|
||||||
|
controllers.add(new NfcStackDebugLogPreferenceController(context));
|
||||||
controllers.add(new ShowTapsPreferenceController(context));
|
controllers.add(new ShowTapsPreferenceController(context));
|
||||||
controllers.add(new PointerLocationPreferenceController(context));
|
controllers.add(new PointerLocationPreferenceController(context));
|
||||||
controllers.add(new ShowSurfaceUpdatesPreferenceController(context));
|
controllers.add(new ShowSurfaceUpdatesPreferenceController(context));
|
||||||
|
@@ -0,0 +1,82 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2021 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.settings.core.PreferenceControllerMixin;
|
||||||
|
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
||||||
|
|
||||||
|
public class NfcStackDebugLogPreferenceController extends
|
||||||
|
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
|
||||||
|
PreferenceControllerMixin {
|
||||||
|
|
||||||
|
private static final String NFC_STACK_DEBUGLOG_ENABLED_KEY =
|
||||||
|
"nfc_stack_debuglog_enabled";
|
||||||
|
@VisibleForTesting
|
||||||
|
static final String NFC_STACK_DEBUGLOG_ENABLED_PROPERTY =
|
||||||
|
"persist.nfc.debug_enabled";
|
||||||
|
|
||||||
|
public NfcStackDebugLogPreferenceController(Context context) {
|
||||||
|
super(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getPreferenceKey() {
|
||||||
|
return NFC_STACK_DEBUGLOG_ENABLED_KEY;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||||
|
final boolean isEnabled = (Boolean) newValue;
|
||||||
|
try {
|
||||||
|
SystemProperties.set(NFC_STACK_DEBUGLOG_ENABLED_PROPERTY,
|
||||||
|
isEnabled ? "true" : "false");
|
||||||
|
} catch (RuntimeException e) {
|
||||||
|
Log.e(TAG, "Fail to set nfc system property: " + e.getMessage());
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateState(Preference preference) {
|
||||||
|
try {
|
||||||
|
final boolean isEnabled = SystemProperties.getBoolean(
|
||||||
|
NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, false /* default */);
|
||||||
|
((SwitchPreference) mPreference).setChecked(isEnabled);
|
||||||
|
} catch (RuntimeException e) {
|
||||||
|
Log.e(TAG, "Fail to get nfc system property: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDeveloperOptionsSwitchDisabled() {
|
||||||
|
super.onDeveloperOptionsSwitchDisabled();
|
||||||
|
try {
|
||||||
|
SystemProperties.set(NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, "false");
|
||||||
|
((SwitchPreference) mPreference).setChecked(false);
|
||||||
|
} catch (RuntimeException e) {
|
||||||
|
Log.e(TAG, "Fail to set nfc system property: " + e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,112 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2021 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 static com.android.settings.development.NfcStackDebugLogPreferenceController
|
||||||
|
.NFC_STACK_DEBUGLOG_ENABLED_PROPERTY;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Looper;
|
||||||
|
import android.os.SystemProperties;
|
||||||
|
|
||||||
|
import androidx.preference.SwitchPreference;
|
||||||
|
import androidx.preference.PreferenceManager;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Rule;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class NfcStackDebugLogPreferenceControllerTest {
|
||||||
|
|
||||||
|
private Context mContext;
|
||||||
|
private NfcStackDebugLogPreferenceController mController;
|
||||||
|
private SwitchPreference mPreference;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
mContext = ApplicationProvider.getApplicationContext();
|
||||||
|
mController = new NfcStackDebugLogPreferenceController(mContext);
|
||||||
|
if (Looper.myLooper() == null) {
|
||||||
|
Looper.prepare();
|
||||||
|
}
|
||||||
|
|
||||||
|
final PreferenceManager preferenceManager = new PreferenceManager(mContext);
|
||||||
|
final PreferenceScreen screen = preferenceManager.createPreferenceScreen(mContext);
|
||||||
|
mPreference = new SwitchPreference(mContext);
|
||||||
|
mPreference.setKey(mController.getPreferenceKey());
|
||||||
|
screen.addPreference(mPreference);
|
||||||
|
mController.displayPreference(screen);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChanged_settingDisabled_shouldTurnOffNfcStackDebugLog() {
|
||||||
|
mController.onPreferenceChange(mPreference, false /* new value */);
|
||||||
|
|
||||||
|
final boolean mode = SystemProperties.getBoolean(
|
||||||
|
NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, false /* default */);
|
||||||
|
|
||||||
|
assertThat(mode).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onPreferenceChanged_settingEnabled_shouldTurnOnNfcStackDebugLog() {
|
||||||
|
mController.onPreferenceChange(mPreference, true /* new value */);
|
||||||
|
|
||||||
|
final boolean mode = SystemProperties.getBoolean(
|
||||||
|
NFC_STACK_DEBUGLOG_ENABLED_PROPERTY, false /* default */);
|
||||||
|
|
||||||
|
assertThat(mode).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_settingEnabled_preferenceShouldBeChecked() {
|
||||||
|
SystemProperties.set(NFC_STACK_DEBUGLOG_ENABLED_PROPERTY,
|
||||||
|
Boolean.toString(true));
|
||||||
|
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
assertThat(mPreference.isChecked()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
|
||||||
|
SystemProperties.set(NFC_STACK_DEBUGLOG_ENABLED_PROPERTY,
|
||||||
|
Boolean.toString(false));
|
||||||
|
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
assertThat(mPreference.isChecked()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
|
||||||
|
mController.onDeveloperOptionsSwitchDisabled();
|
||||||
|
final boolean mode = SystemProperties.getBoolean(
|
||||||
|
NFC_STACK_DEBUGLOG_ENABLED_PROPERTY,
|
||||||
|
false /* default */);
|
||||||
|
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
assertThat(mode).isFalse();
|
||||||
|
assertThat(mPreference.isChecked()).isFalse();
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user