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

Commit bb8f3a3b authored by Peter Qiu's avatar Peter Qiu Committed by android-build-merger
Browse files

Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" 

am: ef0cc620

Change-Id: Id5b7771a25905d8e8e074b62c6ef70363c459d08
parents fe4f473f ef0cc620

wifi/java/android/net/wifi/hotspot2/omadm/PPSMOParser.java

0 → 100644
+786 −0

File added.

Preview size limit exceeded, changes collapsed.

wifi/tests/assets/pps/PerProviderSubscription.xml

0 → 100644
+80 −0
Original line number Diff line number Diff line 
<MgmtTree xmlns="syncml:dmddf1.2">

  <VerDTD>1.2</VerDTD>

  <Node>

    <NodeName>PerProviderSubscription</NodeName>

    <RTProperties>

      <Type>

        <DDFName>urn:wfa:mo:hotspot2dot0-perprovidersubscription:1.0</DDFName>

      </Type>

    </RTProperties>

    <Node>

      <NodeName>i001</NodeName>

      <Node>

        <NodeName>HomeSP</NodeName>

        <Node>

          <NodeName>FriendlyName</NodeName>

          <Value>Century House</Value>

        </Node>

        <Node>

          <NodeName>FQDN</NodeName>

          <Value>mi6.co.uk</Value>

        </Node>

        <Node>

          <NodeName>RoamingConsortiumOI</NodeName>

          <Value>112233,445566</Value>

        </Node>

      </Node>

      <Node>

        <NodeName>Credential</NodeName>

        <Node>

          <NodeName>Realm</NodeName>

          <Value>shaken.stirred.com</Value>

        </Node>

        <Node>

          <NodeName>UsernamePassword</NodeName>

          <Node>

            <NodeName>Username</NodeName>

            <Value>james</Value>

          </Node>

          <Node>

            <NodeName>Password</NodeName>

            <Value>Ym9uZDAwNw==</Value>

          </Node>

          <Node>

            <NodeName>EAPMethod</NodeName>

            <Node>

              <NodeName>EAPType</NodeName>

              <Value>21</Value>

            </Node>

            <Node>

              <NodeName>InnerMethod</NodeName>

              <Value>MS-CHAP-V2</Value>

            </Node>

          </Node>

        </Node>

        <Node>

          <NodeName>DigitalCertificate</NodeName>

          <Node>

            <NodeName>CertificateType</NodeName>

            <Value>x509v3</Value>

          </Node>

          <Node>

            <NodeName>CertSHA256FingerPrint</NodeName>

            <Value>1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f</Value>

          </Node>

        </Node>

        <Node>

          <NodeName>SIM</NodeName>

          <Node>

            <NodeName>IMSI</NodeName>

            <Value>imsi</Value>

          </Node>

          <Node>

            <NodeName>EAPType</NodeName>

            <Value>24</Value>

          </Node>

        </Node>

      </Node>

    </Node>

  </Node>

</MgmtTree>

wifi/tests/assets/pps/PerProviderSubscription_DuplicateHomeSP.xml

0 → 100644
+95 −0
Original line number Diff line number Diff line 
<MgmtTree xmlns="syncml:dmddf1.2">

  <VerDTD>1.2</VerDTD>

  <Node>

    <NodeName>PerProviderSubscription</NodeName>

    <RTProperties>

      <Type>

        <DDFName>urn:wfa:mo:hotspot2dot0-perprovidersubscription:1.0</DDFName>

      </Type>

    </RTProperties>

    <Node>

      <NodeName>i001</NodeName>

      <Node>

        <NodeName>HomeSP</NodeName>

        <Node>

          <NodeName>FriendlyName</NodeName>

          <Value>Century House</Value>

        </Node>

        <Node>

          <NodeName>FQDN</NodeName>

          <Value>mi6.co.uk</Value>

        </Node>

        <Node>

          <NodeName>RoamingConsortiumOI</NodeName>

          <Value>112233,445566</Value>

        </Node>

      </Node>

      <Node>

        <NodeName>HomeSP</NodeName>

        <Node>

          <NodeName>FriendlyName</NodeName>

          <Value>Century House</Value>

        </Node>

        <Node>

          <NodeName>FQDN</NodeName>

          <Value>mi6.co.uk</Value>

        </Node>

        <Node>

          <NodeName>RoamingConsortiumOI</NodeName>

          <Value>112233,445566</Value>

        </Node>

      </Node>

      <Node>

        <NodeName>Credential</NodeName>

        <Node>

          <NodeName>Realm</NodeName>

          <Value>shaken.stirred.com</Value>

        </Node>

        <Node>

          <NodeName>UsernamePassword</NodeName>

          <Node>

            <NodeName>Username</NodeName>

            <Value>james</Value>

          </Node>

          <Node>

            <NodeName>Password</NodeName>

            <Value>Ym9uZDAwNw==</Value>

          </Node>

          <Node>

            <NodeName>EAPMethod</NodeName>

            <Node>

              <NodeName>EAPType</NodeName>

              <Value>21</Value>

            </Node>

            <Node>

              <NodeName>InnerMethod</NodeName>

              <Value>MS-CHAP-V2</Value>

            </Node>

          </Node>

        </Node>

        <Node>

          <NodeName>DigitalCertificate</NodeName>

          <Node>

            <NodeName>CertificateType</NodeName>

            <Value>x509v3</Value>

          </Node>

          <Node>

            <NodeName>CertSHA256FingerPrint</NodeName>

            <Value>1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f</Value>

          </Node>

        </Node>

        <Node>

          <NodeName>SIM</NodeName>

          <Node>

            <NodeName>IMSI</NodeName>

            <Value>imsi</Value>

          </Node>

          <Node>

            <NodeName>EAPType</NodeName>

            <Value>24</Value>

          </Node>

        </Node>

      </Node>

    </Node>

  </Node>

</MgmtTree>

wifi/tests/assets/pps/PerProviderSubscription_DuplicateValue.xml

0 → 100644
+81 −0
Original line number Diff line number Diff line 
<MgmtTree xmlns="syncml:dmddf1.2">

  <VerDTD>1.2</VerDTD>

  <Node>

    <NodeName>PerProviderSubscription</NodeName>

    <RTProperties>

      <Type>

        <DDFName>urn:wfa:mo:hotspot2dot0-perprovidersubscription:1.0</DDFName>

      </Type>

    </RTProperties>

    <Node>

      <NodeName>i001</NodeName>

      <Node>

        <NodeName>HomeSP</NodeName>

        <Node>

          <NodeName>FriendlyName</NodeName>

          <Value>Century House</Value>

          <Value>Century House</Value>

        </Node>

        <Node>

          <NodeName>FQDN</NodeName>

          <Value>mi6.co.uk</Value>

        </Node>

        <Node>

          <NodeName>RoamingConsortiumOI</NodeName>

          <Value>112233,445566</Value>

        </Node>

      </Node>

      <Node>

        <NodeName>Credential</NodeName>

        <Node>

          <NodeName>Realm</NodeName>

          <Value>shaken.stirred.com</Value>

        </Node>

        <Node>

          <NodeName>UsernamePassword</NodeName>

          <Node>

            <NodeName>Username</NodeName>

            <Value>james</Value>

          </Node>

          <Node>

            <NodeName>Password</NodeName>

            <Value>Ym9uZDAwNw==</Value>

          </Node>

          <Node>

            <NodeName>EAPMethod</NodeName>

            <Node>

              <NodeName>EAPType</NodeName>

              <Value>21</Value>

            </Node>

            <Node>

              <NodeName>InnerMethod</NodeName>

              <Value>MS-CHAP-V2</Value>

            </Node>

          </Node>

        </Node>

        <Node>

          <NodeName>DigitalCertificate</NodeName>

          <Node>

            <NodeName>CertificateType</NodeName>

            <Value>x509v3</Value>

          </Node>

          <Node>

            <NodeName>CertSHA256FingerPrint</NodeName>

            <Value>1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f</Value>

          </Node>

        </Node>

        <Node>

          <NodeName>SIM</NodeName>

          <Node>

            <NodeName>IMSI</NodeName>

            <Value>imsi</Value>

          </Node>

          <Node>

            <NodeName>EAPType</NodeName>

            <Value>24</Value>

          </Node>

        </Node>

      </Node>

    </Node>

  </Node>

</MgmtTree>

wifi/tests/assets/pps/PerProviderSubscription_InvalidName.xml

0 → 100644
+80 −0
Original line number Diff line number Diff line 
<MgmtTree xmlns="syncml:dmddf1.2">

  <VerDTD>1.2</VerDTD>

  <Node>

    <NodeName>PerProviderSubscription</NodeName>

    <RTProperties>

      <Type>

        <DDFName>urn:wfa:mo:hotspot2dot0-perprovidersubscription:1.0</DDFName>

      </Type>

    </RTProperties>

    <Node>

      <NodeName>i001</NodeName>

      <Node>

        <NodeName>HomeSP</NodeName>

        <Node>

          <NodeName>FriendName</NodeName>

          <Value>Century House</Value>

        </Node>

        <Node>

          <NodeName>FQDN</NodeName>

          <Value>mi6.co.uk</Value>

        </Node>

        <Node>

          <NodeName>RoamingConsortiumOI</NodeName>

          <Value>112233,445566</Value>

        </Node>

      </Node>

      <Node>

        <NodeName>Credential</NodeName>

        <Node>

          <NodeName>Realm</NodeName>

          <Value>shaken.stirred.com</Value>

        </Node>

        <Node>

          <NodeName>UsernamePassword</NodeName>

          <Node>

            <NodeName>Username</NodeName>

            <Value>james</Value>

          </Node>

          <Node>

            <NodeName>Password</NodeName>

            <Value>Ym9uZDAwNw==</Value>

          </Node>

          <Node>

            <NodeName>EAPMethod</NodeName>

            <Node>

              <NodeName>EAPType</NodeName>

              <Value>21</Value>

            </Node>

            <Node>

              <NodeName>InnerMethod</NodeName>

              <Value>MS-CHAP-V2</Value>

            </Node>

          </Node>

        </Node>

        <Node>

          <NodeName>DigitalCertificate</NodeName>

          <Node>

            <NodeName>CertificateType</NodeName>

            <Value>x509v3</Value>

          </Node>

          <Node>

            <NodeName>CertSHA256FingerPrint</NodeName>

            <Value>1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f1f</Value>

          </Node>

        </Node>

        <Node>

          <NodeName>SIM</NodeName>

          <Node>

            <NodeName>IMSI</NodeName>

            <Value>imsi</Value>

          </Node>

          <Node>

            <NodeName>EAPType</NodeName>

            <Value>24</Value>

          </Node>

        </Node>

      </Node>

    </Node>

  </Node>

</MgmtTree>