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

Commit 1460c30b authored by Ecco Park's avatar Ecco Park
Browse files

passpoint-r2: define new status and new Intents for lauching an OSU app 



Bug: 74244324
Test: ./frameworks/base/wifi/tests/runtests.sh
Test: live test with Passpoint R2 service provider AP
Change-Id: Iba35ab14b6b5925d2ef0435af9e94f97d0d9fa1d
Signed-off-by: default avatarEcco Park <eccopark@google.com>
parent 47cc3c33

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ 
    <protected-broadcast android:name="android.net.wifi.action.PASSPOINT_ICON" />

    <protected-broadcast android:name="android.net.wifi.action.PASSPOINT_OSU_PROVIDERS_LIST" />

    <protected-broadcast android:name="android.net.wifi.action.PASSPOINT_SUBSCRIPTION_REMEDIATION" />

    <protected-broadcast android:name="android.net.wifi.action.PASSPOINT_LAUNCH_OSU_VIEW" />

    <protected-broadcast android:name="android.net.wifi.supplicant.CONNECTION_CHANGE" />

    <protected-broadcast android:name="android.net.wifi.supplicant.STATE_CHANGE" />

    <protected-broadcast android:name="android.net.wifi.p2p.STATE_CHANGED" />

wifi/java/android/net/wifi/WifiManager.java

+25 −0
Original line number Diff line number Diff line
@@ -317,6 +317,31 @@ public class WifiManager { 
    public static final String EXTRA_SUBSCRIPTION_REMEDIATION_METHOD =

            "android.net.wifi.extra.SUBSCRIPTION_REMEDIATION_METHOD";



    /**

     * Activity Action: lunch OSU (Online Sign Up) view.

     * Included extras:

     *

     * {@link #EXTRA_OSU_NETWORK}: {@link Network} instance associated with OSU AP.

     * {@link #EXTRA_URL}: String representation of a server URL used for OSU process.

     *

     * <p>Note: The broadcast is only delivered to registered receivers - no manifest registered

     * components will be launched.

     *

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_PASSPOINT_LAUNCH_OSU_VIEW =

            "android.net.wifi.action.PASSPOINT_LAUNCH_OSU_VIEW";



    /**

     * The lookup key for a {@link android.net.Network} associated with OSU server.

     *

     * Retrieve with {@link android.content.Intent#getParcelableExtra(String)}.

     *

     * @hide

     */

    public static final String EXTRA_OSU_NETWORK = "android.net.wifi.extra.OSU_NETWORK";



    /**

     * Broadcast intent action indicating that Wi-Fi has been enabled, disabled,

     * enabling, disabling, or unknown. One extra provides this state as an int.

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

+21 −0
Original line number Diff line number Diff line
@@ -84,6 +84,17 @@ public abstract class ProvisioningCallback { 
     */

    public static final int OSU_FAILURE_SOAP_MESSAGE_EXCHANGE = 11;



    /**

     * The reason code for provisioning failure when a redirect server fails to start.

     */

    public static final int OSU_FAILURE_START_REDIRECT_SERVER = 12;



    /**

     * The reason code for provisioning failure when there is no OSU activity to listen to

     * {@link WifiManager#ACTION_PASSPOINT_LAUNCH_OSU_VIEW} intent.

     */

    public static final int OSU_FAILURE_NO_OSU_ACTIVITY_FOUND = 13;



    /**

     * The status code for provisioning flow to indicate connecting to OSU AP

     */
@@ -114,6 +125,16 @@ public abstract class ProvisioningCallback { 
     */

    public static final int OSU_STATUS_INIT_SOAP_EXCHANGE = 6;



    /**

     * The status code for provisioning flow to indicate waiting for a HTTP redirect response.

     */

    public static final int OSU_STATUS_WAITING_FOR_REDIRECT_RESPONSE = 7;



    /**

     * The status code for provisioning flow to indicate a HTTP redirect response is received.

     */

    public static final int OSU_STATUS_REDIRECT_RESPONSE_RECEIVED = 8;



    /**

     * Provisioning status for OSU failure

     *