Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add more logging to the Tethering SharedLog" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-07 06:13:55 +00:00
committed by Android (Google) Code Review
parent ec43e485e7 2210890f26
commit 351ba95239
2 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/core/java/com/android/server/connectivity/Tethering.java
View File

@@ -1087,11 +1087,8 @@ public class Tethering extends BaseNetworkObserver {
return list.toArray(new String[list.size()]); return list.toArray(new String[list.size()]);
} }
private void maybeLogMessage(State state, int what) { private void logMessage(State state, int what) {
if (DBG) { mLog.log(state.getName() + " got " + sMagicDecoderRing.get(what, Integer.toString(what)));
Log.d(TAG, state.getName() + " got " +
sMagicDecoderRing.get(what, Integer.toString(what)));
}
} }
private boolean upstreamWanted() { private boolean upstreamWanted() {
@@ -1215,7 +1212,7 @@ public class Tethering extends BaseNetworkObserver {
class InitialState extends State { class InitialState extends State {
@Override @Override
public boolean processMessage(Message message) { public boolean processMessage(Message message) {
maybeLogMessage(this, message.what); logMessage(this, message.what);
switch (message.what) { switch (message.what) {
case EVENT_IFACE_SERVING_STATE_ACTIVE: case EVENT_IFACE_SERVING_STATE_ACTIVE:
TetherInterfaceStateMachine who = (TetherInterfaceStateMachine)message.obj; TetherInterfaceStateMachine who = (TetherInterfaceStateMachine)message.obj;
@@ -1307,21 +1304,21 @@ public class Tethering extends BaseNetworkObserver {
// Find the interface with the default IPv4 route. It may be the // Find the interface with the default IPv4 route. It may be the
// interface described by linkProperties, or one of the interfaces // interface described by linkProperties, or one of the interfaces
// stacked on top of it. // stacked on top of it.
Log.i(TAG, "Finding IPv4 upstream interface on: " + ns.linkProperties); mLog.i("Finding IPv4 upstream interface on: " + ns.linkProperties);
RouteInfo ipv4Default = RouteInfo.selectBestRoute( RouteInfo ipv4Default = RouteInfo.selectBestRoute(
ns.linkProperties.getAllRoutes(), Inet4Address.ANY); ns.linkProperties.getAllRoutes(), Inet4Address.ANY);
if (ipv4Default != null) { if (ipv4Default != null) {
iface = ipv4Default.getInterface(); iface = ipv4Default.getInterface();
Log.i(TAG, "Found interface " + ipv4Default.getInterface()); mLog.i("Found interface " + ipv4Default.getInterface());
} else { } else {
Log.i(TAG, "No IPv4 upstream interface, giving up."); mLog.i("No IPv4 upstream interface, giving up.");
} }
} }
if (iface != null) { if (iface != null) {
setDnsForwarders(ns.network, ns.linkProperties); setDnsForwarders(ns.network, ns.linkProperties);
} }
notifyTetheredOfNewUpstreamIface(iface); notifyDownstreamsOfNewUpstreamIface(iface);
if (ns != null && pertainsToCurrentUpstream(ns)) { if (ns != null && pertainsToCurrentUpstream(ns)) {
// If we already have NetworkState for this network examine // If we already have NetworkState for this network examine
// it immediately, because there likely will be no second // it immediately, because there likely will be no second
@@ -1356,8 +1353,8 @@ public class Tethering extends BaseNetworkObserver {
} }
} }
protected void notifyTetheredOfNewUpstreamIface(String ifaceName) { protected void notifyDownstreamsOfNewUpstreamIface(String ifaceName) {
if (DBG) Log.d(TAG, "Notifying tethered with upstream=" + ifaceName); mLog.log("Notifying downstreams of upstream=" + ifaceName);
mCurrentUpstreamIface = ifaceName; mCurrentUpstreamIface = ifaceName;
for (TetherInterfaceStateMachine sm : mNotifyList) { for (TetherInterfaceStateMachine sm : mNotifyList) {
sm.sendMessage(TetherInterfaceStateMachine.CMD_TETHER_CONNECTION_CHANGED, sm.sendMessage(TetherInterfaceStateMachine.CMD_TETHER_CONNECTION_CHANGED,
@@ -1499,7 +1496,7 @@ public class Tethering extends BaseNetworkObserver {
mOffloadController.stop(); mOffloadController.stop();
mUpstreamNetworkMonitor.stop(); mUpstreamNetworkMonitor.stop();
mSimChange.stopListening(); mSimChange.stopListening();
notifyTetheredOfNewUpstreamIface(null); notifyDownstreamsOfNewUpstreamIface(null);
handleNewUpstreamNetworkState(null); handleNewUpstreamNetworkState(null);
} }
@@ -1518,7 +1515,7 @@ public class Tethering extends BaseNetworkObserver {
@Override @Override
public boolean processMessage(Message message) { public boolean processMessage(Message message) {
maybeLogMessage(this, message.what); logMessage(this, message.what);
boolean retValue = true; boolean retValue = true;
switch (message.what) { switch (message.what) {
case EVENT_IFACE_SERVING_STATE_ACTIVE: { case EVENT_IFACE_SERVING_STATE_ACTIVE: {

16
services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java
View File

@@ -441,12 +441,8 @@ public class TetherInterfaceStateMachine extends StateMachine {
mLastRaParams = newParams; mLastRaParams = newParams;
} }
private void maybeLogMessage(State state, int what) { private void logMessage(State state, int what) {
if (DBG) { mLog.log(state.getName() + " got " + sMagicDecoderRing.get(what, Integer.toString(what)));
Log.d(TAG, state.getName() + " got " +
sMagicDecoderRing.get(what, Integer.toString(what)) + ", Iface = " +
mIfaceName);
}
} }
private void sendInterfaceState(int newInterfaceState) { private void sendInterfaceState(int newInterfaceState) {
@@ -473,7 +469,7 @@ public class TetherInterfaceStateMachine extends StateMachine {
@Override @Override
public boolean processMessage(Message message) { public boolean processMessage(Message message) {
maybeLogMessage(this, message.what); logMessage(this, message.what);
switch (message.what) { switch (message.what) {
case CMD_TETHER_REQUESTED: case CMD_TETHER_REQUESTED:
mLastError = ConnectivityManager.TETHER_ERROR_NO_ERROR; mLastError = ConnectivityManager.TETHER_ERROR_NO_ERROR;
@@ -545,7 +541,7 @@ public class TetherInterfaceStateMachine extends StateMachine {
@Override @Override
public boolean processMessage(Message message) { public boolean processMessage(Message message) {
maybeLogMessage(this, message.what); logMessage(this, message.what);
switch (message.what) { switch (message.what) {
case CMD_TETHER_UNREQUESTED: case CMD_TETHER_UNREQUESTED:
transitionTo(mInitialState); transitionTo(mInitialState);
@@ -595,7 +591,7 @@ public class TetherInterfaceStateMachine extends StateMachine {
public boolean processMessage(Message message) { public boolean processMessage(Message message) {
if (super.processMessage(message)) return true; if (super.processMessage(message)) return true;
maybeLogMessage(this, message.what); logMessage(this, message.what);
switch (message.what) { switch (message.what) {
case CMD_TETHER_REQUESTED: case CMD_TETHER_REQUESTED:
mLog.e("CMD_TETHER_REQUESTED while in local-only hotspot mode."); mLog.e("CMD_TETHER_REQUESTED while in local-only hotspot mode.");
@@ -667,7 +663,7 @@ public class TetherInterfaceStateMachine extends StateMachine {
public boolean processMessage(Message message) { public boolean processMessage(Message message) {
if (super.processMessage(message)) return true; if (super.processMessage(message)) return true;
maybeLogMessage(this, message.what); logMessage(this, message.what);
switch (message.what) { switch (message.what) {
case CMD_TETHER_REQUESTED: case CMD_TETHER_REQUESTED:
mLog.e("CMD_TETHER_REQUESTED while already tethering."); mLog.e("CMD_TETHER_REQUESTED while already tethering.");