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

Commit 327c0b1e authored by Ecco Park's avatar Ecco Park
Browse files

passpoint-r2: change the name for OSU_FAILURE_INVALID_SERVER_URL. 



Currently OSU_FAILURE_INVALID_SERVER_URL name is confused with another
flag called (OSU_FAILURE_SERVER_URL_INVALID) that is used for connecting
OSU server.

So, it is better to change the name to meaningful name.

Bug: 119514793
Test: ./frameworks/base/wifi/tests/runtests.sh
Change-Id: I4dabe6bab12211faae7758b8fc2df2381efb6c21
Signed-off-by: default avatarEcco Park <eccopark@google.com>
parent 8945e2e3

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4398,7 +4398,7 @@ package android.net.wifi.hotspot2 { 
    method public abstract void onProvisioningStatus(int);

    field public static final int OSU_FAILURE_ADD_PASSPOINT_CONFIGURATION = 22; // 0x16

    field public static final int OSU_FAILURE_AP_CONNECTION = 1; // 0x1

    field public static final int OSU_FAILURE_INVALID_SERVER_URL = 8; // 0x8

    field public static final int OSU_FAILURE_INVALID_URL_FORMAT_FOR_OSU = 8; // 0x8

    field public static final int OSU_FAILURE_NO_AAA_SERVER_TRUST_ROOT_NODE = 17; // 0x11

    field public static final int OSU_FAILURE_NO_AAA_TRUST_ROOT_CERTIFICATE = 21; // 0x15

    field public static final int OSU_FAILURE_NO_OSU_ACTIVITY_FOUND = 14; // 0xe

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+1 −1
Original line number Diff line number Diff line
@@ -1555,7 +1555,7 @@ public class AccessPoint implements Comparable<AccessPoint> { 
                    mOsuFailure = mContext.getString(

                            R.string.osu_failure_provisioning_not_available);

                    break;

                case OSU_FAILURE_INVALID_SERVER_URL:

                case OSU_FAILURE_INVALID_URL_FORMAT_FOR_OSU:

                    mOsuFailure = mContext.getString(R.string.osu_failure_invalid_server_url);

                    break;

                case OSU_FAILURE_UNEXPECTED_COMMAND_TYPE:

wifi/java/android/net/wifi/hotspot2/ProvisioningCallback.java

+2 −2
Original line number Diff line number Diff line
@@ -65,9 +65,9 @@ public abstract class ProvisioningCallback { 
    public static final int OSU_FAILURE_PROVISIONING_NOT_AVAILABLE = 7;



    /**

     * The reason code for provisioning failure due to invalid server url.

     * The reason code for provisioning failure due to invalid web url format for an OSU web page.

     */

    public static final int OSU_FAILURE_INVALID_SERVER_URL = 8;

    public static final int OSU_FAILURE_INVALID_URL_FORMAT_FOR_OSU = 8;



    /**

     * The reason code for provisioning failure when a command received is not the expected command