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

Commit 5671eedd authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

DHCP: Add a superclass for DhcpStateMachine. 

This can be used to switch between different DHCP client
implementations. The caller can declare objects of type
BaseDhcpStateMachine, and call its methods, without needing to
care what implementation is in use.

Bug: 19704592
Change-Id: Icefad9b0d0f83b349681388b1fa16b5e2e37c042
parent 475085b9

core/java/android/net/BaseDhcpStateMachine.java

0 → 100644
+35 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.net;



import com.android.internal.util.StateMachine;



/**

 * Interface that must be implemented by DHCP state machines.

 *

 * This is an abstract class instead of a Java interface so that callers can just declare an object

 * of this type and be able to call all the methods defined by either StateMachine or this class.

 *

 * @hide

 */

public abstract class BaseDhcpStateMachine extends StateMachine {

    protected BaseDhcpStateMachine(String tag) {

        super(tag);

    }

    public abstract void registerForPreDhcpNotification();

    public abstract void doQuit();

}

core/java/android/net/DhcpStateMachine.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ import android.util.Log; 
 *

 *

 * @hide

 * @hide

 */

 */

public class DhcpStateMachine extends StateMachine {

public class DhcpStateMachine extends BaseDhcpStateMachine {





    private static final String TAG = "DhcpStateMachine";

    private static final String TAG = "DhcpStateMachine";

    private static final boolean DBG = false;

    private static final boolean DBG = false;
@@ -161,6 +161,7 @@ public class DhcpStateMachine extends StateMachine { 
     * This is used by Wifi at this time for the purpose of doing BT-Wifi coex

     * This is used by Wifi at this time for the purpose of doing BT-Wifi coex

     * handling during Dhcp

     * handling during Dhcp

     */

     */

    @Override

    public void registerForPreDhcpNotification() {

    public void registerForPreDhcpNotification() {

        mRegisteredForPreDhcpNotification = true;

        mRegisteredForPreDhcpNotification = true;

    }

    }
@@ -170,6 +171,7 @@ public class DhcpStateMachine extends StateMachine { 
     *

     *

     * @hide

     * @hide

     */

     */

    @Override

    public void doQuit() {

    public void doQuit() {

        quit();

        quit();

    }

    }