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

Commit e0410f77 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Don't throw RuntimeException on supplicant start/stop failure 

In the start case, throw NoSuchElementException instead.
Stop case doesn't throw (since there is no recovery path anyway).

Bug: 175425346
Test: start/stop Wi-Fi with Supplicant disabled
Change-Id: I350887acbb4f20f9835619d40128fb382bd94c4f
parent 475acd3f

services/wifi/java/com/android/server/wifi/SupplicantManager.java

+19 −2
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ package com.android.server.wifi; 


import android.annotation.SystemApi;

import android.os.SystemService;

import android.util.Log;



import java.util.NoSuchElementException;



/**

 * Wrapper to start/stop supplicant daemon using init system.
@@ -25,6 +28,8 @@ import android.os.SystemService; 
 */

@SystemApi(client = SystemApi.Client.SYSTEM_SERVER)

public class SupplicantManager {

    private static final String TAG = "SupplicantManager";



    private static final String WPA_SUPPLICANT_DAEMON_NAME = "wpa_supplicant";



    private SupplicantManager() {}
@@ -32,9 +37,16 @@ public class SupplicantManager { 
    /**

     * Start the wpa_supplicant daemon.

     * Note: This uses the init system to start the "wpa_supplicant" service.

     *

     * @throws NoSuchElementException if supplicant daemon failed to start

     */

    public static void start() {

        try {

            SystemService.start(WPA_SUPPLICANT_DAEMON_NAME);

        } catch (RuntimeException e) {

            // likely a "failed to set system property" runtime exception

            throw new NoSuchElementException("Failed to start Supplicant");

        }

    }



    /**
@@ -42,6 +54,11 @@ public class SupplicantManager { 
     * Note: This uses the init system to stop the "wpa_supplicant" service.

     */

    public static void stop() {

        try {

            SystemService.stop(WPA_SUPPLICANT_DAEMON_NAME);

        } catch (RuntimeException e) {

            // likely a "failed to set system property" runtime exception

            Log.w(TAG, "Failed to stop Supplicant", e);

        }

    }

}