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

Commit 162db72a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "WifiMigration: Add sample config store XML files" into rvc-dev

parents 0fb37762 da0704b2

wifi/java/android/net/wifi/WifiMigration.java

+8 −2
Original line number Diff line number Diff line
@@ -138,7 +138,10 @@ public final class WifiMigration { 


    /**

     * Load data from legacy shared wifi config store file.

     * TODO(b/149418926): Add XSD for the AOSP file format for each file from R.

     * <p>

     * Expected AOSP format is available in the sample files under {@code /frameworks/base/wifi/

     * java/android/net/wifi/migration_samples}.

     * </p>

     * <p>

     * Note:

     * <li>OEMs need to change the implementation of
@@ -214,7 +217,10 @@ public final class WifiMigration { 


    /**

     * Load data from legacy user wifi config store file.

     * TODO(b/149418926): Add XSD for the AOSP file format for each file from R.

     * <p>

     * Expected AOSP format is available in the sample files under {@code /frameworks/base/wifi/

     * java/android/net/wifi/migration_samples}.

     * </p>

     * <p>

     * Note:

     * <li>OEMs need to change the implementation of

wifi/java/android/net/wifi/migration_samples/README.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
This folder contains sample files for each of the 4 XML Wi-Fi config store files in Android 11 AOSP.

OEMs can use these files as reference for converting their previous customized

formats into the AOSP format. The conversion logic needs to be written in

WifiMigration.java class, i.e each OEM needs to modify

WifiMigration.convertAndRetrieveSharedConfigStoreFile() and the

WifiMigration.convertAndRetrieveUserConfigStoreFile() methods.



The 4 files are:



Shared files

============

1) WifiConfigStore.xml - General storage for shared configurations. Includes

user's saved Wi-Fi networks.

AOSP Path in Android 10: /data/misc/wifi/WifiConfigStore.xml

AOSP Path in Android 11: /data/misc/apexdata/com.android/wifi/WifiConfigStore.xml

Sample File (in this folder): Shared_WifiConfigStore.xml



2) WifiConfigStoreSoftAp.xml - Storage for user's softap/tethering configuration.

AOSP Path in Android 10: /data/misc/wifi/softap.conf.

Note: Was key/value format in Android 10. Conversion to XML done in SoftApConfToXmlMigrationUtil.java.

AOSP Path in Android 11: /data/misc/apexdata/com.android/wifi/WifiConfigStore.xml

Sample File (in this folder): Shared_WifiConfigStoreSoftAp.xml



User specific files

==================

3) WifiConfigStore.xml - General storage for user specific configurations. Includes

user's saved passpoint networks, Wi-Fi network request approvals, etc.

AOSP Path in Android 10: /data/misc_ce/<userId>/wifi/WifiConfigStore.xml

AOSP Path in Android 11: /data/misc_ce/<userId>/apexdata/com.android/wifi/WifiConfigStore.xml

Sample File (in this folder): User_WifiConfigStore.xml



4) WifiConfigStoreNetworkSuggestions.xml - Storage for app installed network suggestions.

AOSP Path in Android 10: /data/misc_ce/<userId>/wifi/WifiConfigStoreNetworkSuggestions.xml

AOSP Path in Android 11: /data/misc_ce/<userId>/apexdata/com.android/wifi/WifiConfigStoreNetworkSuggestions.xml

Sample File (in this folder): User_WifiConfigStoreNetworkSuggestions.xml

wifi/java/android/net/wifi/migration_samples/Shared_WifiConfigStore.xml

0 → 100644
+200 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>

<WifiConfigStoreData>

<int name="Version" value="3" />

<NetworkList>

<Network>

<WifiConfiguration>

<string name="ConfigKey">&quot;OPEN_SSID&quot;NONE</string>

<string name="SSID">&quot;OPEN_SSID&quot;</string>

<null name="PreSharedKey" />

<null name="WEPKeys" />

<int name="WEPTxKeyIndex" value="0" />

<boolean name="HiddenSSID" value="false" />

<boolean name="RequirePMF" value="false" />

<byte-array name="AllowedKeyMgmt" num="1">01</byte-array>

<byte-array name="AllowedProtocols" num="1">03</byte-array>

<byte-array name="AllowedAuthAlgos" num="0"></byte-array>

<byte-array name="AllowedGroupCiphers" num="1">2f</byte-array>

<byte-array name="AllowedPairwiseCiphers" num="1">0e</byte-array>

<byte-array name="AllowedGroupMgmtCiphers" num="1">04</byte-array>

<byte-array name="AllowedSuiteBCiphers" num="0"></byte-array>

<boolean name="Shared" value="true" />

<boolean name="AutoJoinEnabled" value="true" />

<boolean name="Trusted" value="true" />

<null name="BSSID" />

<int name="Status" value="2" />

<null name="FQDN" />

<null name="ProviderFriendlyName" />

<null name="LinkedNetworksList" />

<null name="DefaultGwMacAddress" />

<boolean name="ValidatedInternetAccess" value="true" />

<boolean name="NoInternetAccessExpected" value="false" />

<boolean name="MeteredHint" value="false" />

<int name="MeteredOverride" value="0" />

<boolean name="UseExternalScores" value="false" />

<int name="NumAssociation" value="3" />

<int name="CreatorUid" value="1000" />

<string name="CreatorName">android.uid.system:1000</string>

<int name="LastUpdateUid" value="1000" />

<string name="LastUpdateName">android.uid.system:1000</string>

<int name="LastConnectUid" value="1000" />

<boolean name="IsLegacyPasspointConfig" value="false" />

<long-array name="RoamingConsortiumOIs" num="0" />

<string name="RandomizedMacAddress">ce:b1:36:bb:71:ac</string>

<int name="MacRandomizationSetting" value="1" />

<int name="CarrierId" value="-1" />

</WifiConfiguration>

<NetworkStatus>

<string name="SelectionStatus">NETWORK_SELECTION_ENABLED</string>

<string name="DisableReason">NETWORK_SELECTION_ENABLE</string>

<string name="ConnectChoice">&quot;ENTERPRISE_SSID&quot;WPA_EAP</string>

<boolean name="HasEverConnected" value="true" />

</NetworkStatus>

<IpConfiguration>

<string name="IpAssignment">DHCP</string>

<string name="ProxySettings">NONE</string>

</IpConfiguration>

</Network>

<Network>

<WifiConfiguration>

<string name="ConfigKey">&quot;ENTERPRISE_SSID&quot;WPA_EAP</string>

<string name="SSID">&quot;ENTERPRISE_SSID&quot;</string>

<null name="PreSharedKey" />

<null name="WEPKeys" />

<int name="WEPTxKeyIndex" value="0" />

<boolean name="HiddenSSID" value="false" />

<boolean name="RequirePMF" value="false" />

<byte-array name="AllowedKeyMgmt" num="1">0c</byte-array>

<byte-array name="AllowedProtocols" num="1">03</byte-array>

<byte-array name="AllowedAuthAlgos" num="0"></byte-array>

<byte-array name="AllowedGroupCiphers" num="1">2f</byte-array>

<byte-array name="AllowedPairwiseCiphers" num="1">0e</byte-array>

<byte-array name="AllowedGroupMgmtCiphers" num="1">04</byte-array>

<byte-array name="AllowedSuiteBCiphers" num="0"></byte-array>

<boolean name="Shared" value="true" />

<boolean name="AutoJoinEnabled" value="true" />

<boolean name="Trusted" value="true" />

<null name="BSSID" />

<int name="Status" value="2" />

<null name="FQDN" />

<null name="ProviderFriendlyName" />

<null name="LinkedNetworksList" />

<null name="DefaultGwMacAddress" />

<boolean name="ValidatedInternetAccess" value="false" />

<boolean name="NoInternetAccessExpected" value="false" />

<boolean name="MeteredHint" value="false" />

<int name="MeteredOverride" value="0" />

<boolean name="UseExternalScores" value="false" />

<int name="NumAssociation" value="0" />

<int name="CreatorUid" value="1000" />

<string name="CreatorName">android.uid.system:1000</string>

<int name="LastUpdateUid" value="1000" />

<string name="LastUpdateName">android.uid.system:1000</string>

<int name="LastConnectUid" value="1000" />

<boolean name="IsLegacyPasspointConfig" value="false" />

<long-array name="RoamingConsortiumOIs" num="0" />

<string name="RandomizedMacAddress">f6:b3:94:44:40:87</string>

<int name="MacRandomizationSetting" value="1" />

<int name="CarrierId" value="-1" />

</WifiConfiguration>

<NetworkStatus>

<string name="SelectionStatus">NETWORK_SELECTION_TEMPORARY_DISABLED</string>

<string name="DisableReason">NETWORK_SELECTION_DISABLED_AUTHENTICATION_FAILURE</string>

<null name="ConnectChoice" />

<boolean name="HasEverConnected" value="false" />

</NetworkStatus>

<IpConfiguration>

<string name="IpAssignment">DHCP</string>

<string name="ProxySettings">NONE</string>

</IpConfiguration>

<WifiEnterpriseConfiguration>

<string name="Identity">adadadasdaddsa</string>

<string name="AnonIdentity">asdadaddadasd</string>

<string name="Password">adasdadadad</string>

<string name="ClientCert"></string>

<string name="CaCert"></string>

<string name="SubjectMatch"></string>

<string name="Engine">0</string>

<string name="EngineId"></string>

<string name="PrivateKeyId"></string>

<string name="AltSubjectMatch"></string>

<string name="DomSuffixMatch">adsad</string>

<string name="CaPath">/system/etc/security/cacerts</string>

<int name="EapMethod" value="0" />

<int name="Phase2Method" value="3" />

<string name="PLMN"></string>

<string name="Realm"></string>

<int name="Ocsp" value="0" />

<string name="WapiCertSuite"></string>

</WifiEnterpriseConfiguration>

</Network>

<Network>

<WifiConfiguration>

<string name="ConfigKey">&quot;WPA3_SSID&quot;SAE</string>

<string name="SSID">&quot;WPA3_SSID&quot;</string>

<string name="PreSharedKey">&quot;sfsdfsfdsfsdf&quot;</string>

<null name="WEPKeys" />

<int name="WEPTxKeyIndex" value="0" />

<boolean name="HiddenSSID" value="false" />

<boolean name="RequirePMF" value="true" />

<byte-array name="AllowedKeyMgmt" num="2">0001</byte-array>

<byte-array name="AllowedProtocols" num="1">02</byte-array>

<byte-array name="AllowedAuthAlgos" num="0"></byte-array>

<byte-array name="AllowedGroupCiphers" num="1">28</byte-array>

<byte-array name="AllowedPairwiseCiphers" num="1">0c</byte-array>

<byte-array name="AllowedGroupMgmtCiphers" num="1">04</byte-array>

<byte-array name="AllowedSuiteBCiphers" num="0"></byte-array>

<boolean name="Shared" value="true" />

<boolean name="AutoJoinEnabled" value="true" />

<boolean name="Trusted" value="true" />

<null name="BSSID" />

<int name="Status" value="1" />

<null name="FQDN" />

<null name="ProviderFriendlyName" />

<null name="LinkedNetworksList" />

<null name="DefaultGwMacAddress" />

<boolean name="ValidatedInternetAccess" value="false" />

<boolean name="NoInternetAccessExpected" value="false" />

<boolean name="MeteredHint" value="false" />

<int name="MeteredOverride" value="0" />

<boolean name="UseExternalScores" value="false" />

<int name="NumAssociation" value="0" />

<int name="CreatorUid" value="1000" />

<string name="CreatorName">android.uid.system:1000</string>

<int name="LastUpdateUid" value="1000" />

<string name="LastUpdateName">android.uid.system:1000</string>

<int name="LastConnectUid" value="1000" />

<boolean name="IsLegacyPasspointConfig" value="false" />

<long-array name="RoamingConsortiumOIs" num="0" />

<string name="RandomizedMacAddress">a6:3d:b0:13:ed:41</string>

<int name="MacRandomizationSetting" value="1" />

<int name="CarrierId" value="-1" />

</WifiConfiguration>

<NetworkStatus>

<string name="SelectionStatus">NETWORK_SELECTION_PERMANENTLY_DISABLED</string>

<string name="DisableReason">NETWORK_SELECTION_DISABLED_BY_WRONG_PASSWORD</string>

<null name="ConnectChoice" />

<boolean name="HasEverConnected" value="false" />

</NetworkStatus>

<IpConfiguration>

<string name="IpAssignment">DHCP</string>

<string name="ProxySettings">NONE</string>

</IpConfiguration>

</Network>

</NetworkList>

<MacAddressMap>

<map name="MacMapEntry" />

</MacAddressMap>

<Settings>

<map name="Values">

<boolean name="wifi_p2p_pending_factory_reset" value="false" />

<boolean name="wifi_scan_throttle_enabled" value="true" />

<null name="wifi_p2p_device_name" />

<boolean name="wifi_scan_always_enabled" value="false" />

<boolean name="wifi_verbose_logging_enabled" value="true" />

</map>

</Settings>

<PasspointConfigData>

<long name="ProviderIndex" value="0" />

</PasspointConfigData>

</WifiConfigStoreData>

wifi/java/android/net/wifi/migration_samples/Shared_WifiConfigStoreSoftAp.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>

<WifiConfigStoreData>

<int name="Version" value="3" />

<SoftAp>

<string name="SSID">HOTSPOT_SSID</string>

<int name="ApBand" value="1" />

<int name="Channel" value="0" />

<boolean name="HiddenSSID" value="false" />

<int name="SecurityType" value="1" />

<string name="Passphrase">blahblahblah</string>

<int name="MaxNumberOfClients" value="0" />

<boolean name="ClientControlByUser" value="false" />

<boolean name="AutoShutdownEnabled" value="true" />

<long name="ShutdownTimeoutMillis" value="0" />

<BlockedClientList>

<string name="ClientMacAddress">00:11:22:33:44:55</string>

</BlockedClientList>

<AllowedClientList>

<string name="ClientMacAddress">aa:bb:cc:dd:ee:ff</string>

</AllowedClientList>

</SoftAp>

</WifiConfigStoreData>

wifi/java/android/net/wifi/migration_samples/User_WifiConfigStore.xml

0 → 100644
+81 −0
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>

<WifiConfigStoreData>

<int name="Version" value="3" />

<NetworkList />

<PasspointConfigData>

<ProviderList>

<Provider>

<long name="ProviderID" value="0" />

<int name="CreatorUID" value="10085" />

<string name="PackageName">com.android.certinstaller</string>

<list name="CaCertificateAliases">

<string>HS2_0_0</string>

</list>

<null name="ClientPrivateKeyAlias" />

<boolean name="HasEverConnected" value="false" />

<boolean name="IsFromSuggestion" value="false" />

<boolean name="IsTrusted" value="true" />

<Configuration>

<int name="UpdateIdentifier" value="-2147483648" />

<int name="CredentialPriority" value="-2147483648" />

<null name="TrustRootCertList" />

<long name="SubscriptionCreationTime" value="-9223372036854775808" />

<long name="SubscriptionExpirationTime" value="-9223372036854775808" />

<null name="SubscriptionType" />

<long name="UsageLimitTimePeriod" value="-9223372036854775808" />

<long name="UsageLimitStartTime" value="-9223372036854775808" />

<long name="UsageLimitDataLimit" value="-9223372036854775808" />

<long name="UsageLimitTimeLimit" value="-9223372036854775808" />

<HomeSP>

<string name="FQDN">Passpoint.net</string>

<string name="FriendlyName">Passpoint Friendly Name</string>

<null name="IconURL" />

<null name="HomeNetworkIDs" />

<null name="MatchAllOIs" />

<null name="MatchAnyOIs" />

<null name="OtherHomePartners" />

<null name="RoamingConsortiumOIs" />

</HomeSP>

<Credential>

<long name="CreationTime" value="-9223372036854775808" />

<long name="ExpirationTime" value="-9223372036854775808" />

<string name="Realm">passpoint.com</string>

<boolean name="CheckAAAServerCertStatus" value="false" />

<UserCredential>

<string name="Username">blahblahblah</string>

<string name="Password">doubleblahlah</string>

<boolean name="MachineManaged" value="true" />

<null name="SoftTokenApp" />

<boolean name="AbleToShare" value="false" />

<int name="EAPType" value="21" />

<string name="NonEAPInnerMethod">PAP</string>

</UserCredential>

</Credential>

<int name="CarrierId" value="-1" />

<boolean name="AutoJoinEnabled" value="true" />

<boolean name="IsMacRandomizationEnabled" value="true" />

<int name="MeteredOverride" value="0" />

</Configuration>

<null name="RemediationCaCertificateAlias" />

</Provider>

</ProviderList>

</PasspointConfigData>

<OpenNetworkNotifierBlacklistConfigData />

<NetworkRequestMap>

<ApprovedAccessPointsPerApp>

<string name="RequestorPackageName">com.android.cts.verifier</string>

<AccessPoint>

<string name="SSID">OPEN_SSID</string>

<string name="BSSID">00:11:22:33:44:55</string>

<int name="NetworkType" value="0" />

</AccessPoint>

</ApprovedAccessPointsPerApp>

</NetworkRequestMap>

<WakeupConfigStoreData>

<FeatureState>

<boolean name="IsActive" value="false" />

<boolean name="IsOnboarded" value="false" />

<int name="NotificationsShown" value="1" />

</FeatureState>

</WakeupConfigStoreData>

</WifiConfigStoreData>