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

Commit ce74fc29 authored by Rebecca Silberstein's avatar Rebecca Silberstein
Browse files

WifiManager: implement start/stopLocalOnlyHotspot 

Implement new calls to startLocalOnlyHotspot and
cancelLocalOnlyHotspotRequest along with the classes
LocalOnlyHotspotCallback and LocalOnlyHotspotReservation.

Added tests for starting LOHS and cancelling a LOHS request.

The calls will be exposed in a later CL.

Bug: 36704763
Test: compiles
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: If54a89cb8dfd235bc18ef3e6c89f9d30882136a3
parent 54a540c0

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

+40 −3
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.os.WorkSource; 
import android.util.Log;

import android.util.SparseArray;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.AsyncChannel;

import com.android.internal.util.Protocol;
@@ -862,6 +863,12 @@ public class WifiManager { 
    /** @hide */

    public static final int HOTSPOT_OBSERVER_REGISTERED = 3;



    private final Object mLock = new Object(); // lock guarding access to the following vars

    @GuardedBy("mLock")

    private LocalOnlyHotspotCallbackProxy mLOHSCallbackProxy;

    @GuardedBy("mLock")

    private LocalOnlyHotspotObserverProxy mLOHSObserverProxy;



    /**

     * Create a new WifiManager instance.

     * Applications will almost always want to use
@@ -1880,7 +1887,24 @@ public class WifiManager { 
     */

    public void startLocalOnlyHotspot(LocalOnlyHotspotCallback callback,

            @Nullable Handler handler) {

        throw new UnsupportedOperationException("LocalOnlyHotspot is still in development");

        synchronized (mLock) {

            Looper looper = (handler == null) ? mContext.getMainLooper() : handler.getLooper();

            LocalOnlyHotspotCallbackProxy proxy =

                    new LocalOnlyHotspotCallbackProxy(this, looper, callback);

            try {

                WifiConfiguration config = mService.startLocalOnlyHotspot(

                        proxy.getMessenger(), new Binder());

                if (config == null) {

                    // Send message to the proxy to make sure we call back on the correct thread

                    proxy.notifyFailed(

                            LocalOnlyHotspotCallback.ERROR_INCOMPATIBLE_MODE);

                    return;

                }

                mLOHSCallbackProxy = proxy;

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

        }

    }



    /**
@@ -1897,7 +1921,9 @@ public class WifiManager { 
     * @hide

     */

    public void cancelLocalOnlyHotspotRequest() {

        throw new UnsupportedOperationException("LocalOnlyHotspot is still in development");

        synchronized (mLock) {

            stopLocalOnlyHotspot();

        }

    }



    /**
@@ -1911,7 +1937,18 @@ public class WifiManager { 
     *  method on their LocalOnlyHotspotReservation.

     */

    private void stopLocalOnlyHotspot() {

        throw new UnsupportedOperationException("LocalOnlyHotspot is still in development");

        synchronized (mLock) {

            if (mLOHSCallbackProxy == null) {

                // nothing to do, the callback was already cleaned up.

                return;

            }

            mLOHSCallbackProxy = null;

            try {

                mService.stopLocalOnlyHotspot();

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

        }

    }



    /**

wifi/tests/src/android/net/wifi/WifiManagerTest.java

0 → 100644
+582 −0

File added.

Preview size limit exceeded, changes collapsed.