Bug 4322307
Fixed some other assertions that didn't check for
either CONNECTING or CONNECTED. Cleaned up some
code and removed some extraneous checks.
Original description:
"Fix cts tests for Wi-Fi only devices.
For Wi-Fi only device,
startUsingNetworkFeature() returns Phone.APN_TYPE_NOT_AVAILABLE
stopUsingNetworkFeature() return 1;
In NetworkInfoTest:
cm.getAllNetworkInfo() returns an array of NetworkInfo.
But the index is not based on network type."
Change-Id: I0b5e3d0cfe5fac18bca0a5ca2ce4cc73bc4dfa16
4a88b709cc