p2p: support factory reset for P2P group
provide system API for Settings
Bug: 109866998
Test: Manual tests
* manual trigger network reset in below conditions:
* trigger network reset with P2P on
* trigger network reset with WiFi on, P2P off
* trigger network reset with WiFi off
* trigger network reset with WiFi off then do reboot
* check groups shown in WiFi Direct page
* use wpa_cli -i p2p0 list_network
Test: CtsVerifier - WiFi Direct category
Test: Unit tests - atest frameworks/opt/net/wifi/tests/wifitests
Test: Permission check
* call factoryReset as Guest
* call factoryReset from 3rd-party application
Change-Id: Id487ebf4564b78b613b550c0f0266effb0ae793e
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 689f975..7de55e6 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4892,6 +4892,7 @@
MOVED_TO_GLOBAL.add(Settings.Global.WIFI_NETWORK_SHOW_RSSI);
MOVED_TO_GLOBAL.add(Settings.Global.WIFI_WATCHDOG_ON);
MOVED_TO_GLOBAL.add(Settings.Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED);
+ MOVED_TO_GLOBAL.add(Settings.Global.WIFI_P2P_PENDING_FACTORY_RESET);
MOVED_TO_GLOBAL.add(Settings.Global.WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON);
MOVED_TO_GLOBAL.add(Settings.Global.PACKAGE_VERIFIER_ENABLE);
MOVED_TO_GLOBAL.add(Settings.Global.PACKAGE_VERIFIER_TIMEOUT);
@@ -9984,6 +9985,15 @@
"wifi_rtt_background_exec_gap_ms";
/**
+ * Indicate whether factory reset request is pending.
+ *
+ * Type: int (0 for false, 1 for true)
+ * @hide
+ */
+ public static final String WIFI_P2P_PENDING_FACTORY_RESET =
+ "wifi_p2p_pending_factory_reset";
+
+ /**
* Whether soft AP will shut down after a timeout period when no devices are connected.
*
* Type: int (0 for false, 1 for true)
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 4980210..6bd02ac 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -494,6 +494,7 @@
Settings.Global.WIFI_NUM_OPEN_NETWORKS_KEPT,
Settings.Global.WIFI_ON,
Settings.Global.WIFI_P2P_DEVICE_NAME,
+ Settings.Global.WIFI_P2P_PENDING_FACTORY_RESET,
Settings.Global.WIFI_REENABLE_DELAY_MS,
Settings.Global.WIFI_RTT_BACKGROUND_EXEC_GAP_MS,
Settings.Global.WIFI_SAVED_STATE,