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

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

Merge "passpoint-r2: change the name for OSU_FAILURE_INVALID_SERVER_URL."

parents 839ee8df 327c0b1e

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4732,7 +4732,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