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

Commit 3ec9ebb8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the potential double transition in DhcpState#enter" into rvc-dev... 

Merge "Fix the potential double transition in DhcpState#enter" into rvc-dev am: 2e16ff33 am: df1fcffe

Change-Id: Ia9e1452d3d9a98dd38eb3f1a34e4f754c3c87c44
parents 4d6fef4f df1fcffe

src/android/net/dhcp/DhcpClient.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -959,7 +959,9 @@ public class DhcpClient extends StateMachine { 
                Log.e(TAG, "Fail to start DHCP Packet Handler");

                Log.e(TAG, "Fail to start DHCP Packet Handler");

            }

            }

            notifyFailure();

            notifyFailure();

            transitionTo(mStoppedState);

            // We cannot call transitionTo because a transition is still in progress.

            // Instead, ensure that we process CMD_STOP_DHCP as soon as the transition is complete.

            deferMessage(obtainMessage(CMD_STOP_DHCP));

        }

        }





        @Override

        @Override