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

Commit 84d601fb authored by Ecco Park's avatar Ecco Park
Browse files

passpoint-r1: fix the wrong filed for PPS-MO. 



Currently Passpoint-r1 follows the PPS-MO format to install passpoint
profile.

Howevever, one field(SubscriptionParameter) is not correct.
Normally passpoint-r1 doesn't use this field because this is used for
passpoint-r2 feature.
So, currently there is no issue with wrong field for using passpoint-r1.

But, it needs to be "SubscriptionParameters" according to the hostpot2.0
release 2.0 techinical specification.

Bug: 111449001
Test:  ./frameworks/base/wifi/tests/runtests.sh
Change-Id: Idb6bb4d28913bd3d0905b330e25fbb20b99bbf2e
Signed-off-by: default avatarEcco Park <eccopark@google.com>
parent 89c9a128

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -136,7 +136,7 @@ public final class PpsMoParser { 
    private static final String NODE_UPDATE_IDENTIFIER = "UpdateIdentifier";

    private static final String NODE_UPDATE_IDENTIFIER = "UpdateIdentifier";

    private static final String NODE_AAA_SERVER_TRUST_ROOT = "AAAServerTrustRoot";

    private static final String NODE_AAA_SERVER_TRUST_ROOT = "AAAServerTrustRoot";

    private static final String NODE_SUBSCRIPTION_UPDATE = "SubscriptionUpdate";

    private static final String NODE_SUBSCRIPTION_UPDATE = "SubscriptionUpdate";

    private static final String NODE_SUBSCRIPTION_PARAMETER = "SubscriptionParameter";

    private static final String NODE_SUBSCRIPTION_PARAMETER = "SubscriptionParameters";

    private static final String NODE_TYPE_OF_SUBSCRIPTION = "TypeOfSubscription";

    private static final String NODE_TYPE_OF_SUBSCRIPTION = "TypeOfSubscription";

    private static final String NODE_USAGE_LIMITS = "UsageLimits";

    private static final String NODE_USAGE_LIMITS = "UsageLimits";

    private static final String NODE_DATA_LIMIT = "DataLimit";

    private static final String NODE_DATA_LIMIT = "DataLimit";

wifi/tests/assets/pps/PerProviderSubscription.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -368,7 +368,7 @@ 
        </Node>

        </Node>

      </Node>

      </Node>

      <Node>

      <Node>

        <NodeName>SubscriptionParameter</NodeName>

        <NodeName>SubscriptionParameters</NodeName>

        <Node>

        <Node>

          <NodeName>CreationDate</NodeName>

          <NodeName>CreationDate</NodeName>

          <Value>2016-02-01T10:00:00Z</Value>

          <Value>2016-02-01T10:00:00Z</Value>