OSDN Git Service

Nat464Xlat: internal state guards cleanup + state enum
authorHugo Benichi <hugobenichi@google.com>
Thu, 29 Jun 2017 05:04:13 +0000 (14:04 +0900)
committerHugo Benichi <hugobenichi@google.com>
Tue, 29 Aug 2017 01:02:24 +0000 (10:02 +0900)
commit883b6492d7fdf94f0ac3a22af62a11303309827b
tree0cfcfb55ab8889c6e58a612fcae8c30509fe1008
parent6f62b73915296e59390e69b15160ccb7c031f733
Nat464Xlat: internal state guards cleanup + state enum

This patch does some cleanup of Nat464Xlat internal state guards
against the Nat464Xlat state Idle | Started | Running, which reduces
code nesting.

It also replaces introspection of internal state for distinguishing
between different stages in 464xlat lifecycle with an enum explicitly
introducing these three Idle | Started | Running states.

Bug: 62997041
Bug: 64571917
Test:  runtest frameworks-net
       manually connected to ipv6 network and went to test-ipv6.com
Merged-In: I6efc9fed2420ca488731a2b9b9c3c025b16eca10
Merged-In: I188ac4c367db11cb33b67fe92df3a120e3c6fbce
Merged-In: I7e2c5db8d537fb0ab47cde37158b7f04d7786942
Merged-In: Ic2246a97618c596dbdbf48cda39c2f5b66e3bfb6
Merged-In: Ib04b9a3d56e9daf61b299a30e24a3c8839819a00
Merged-In: Icc1558a0f0e7c299270f550897347458e2bd3188

(cherry pick from commit 4f6f139869ddadf6f9ed50967c106a10a2e8ce3f)

Change-Id: Iebc7d153d8cd0b90d074d8d6eed821fbc3f1370d
services/core/java/com/android/server/connectivity/Nat464Xlat.java