LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes Ib8fe719f,Ia8c05780 into sc-dev am: 3ea9a136fa

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14779544

Change-Id: I11b73ce42cae4df5314ad58e0a92b4cb834b8ff1
This commit is contained in:
TreeHugger Robot
2021-06-10 14:54:34 +00:00
committed by Automerger Merge Worker
parent dc664bd9e9 3ea9a136fa
commit 532c1a2b5e
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Tethering/src/android/net/ip/IpServer.java
View File

@@ -1054,8 +1054,16 @@ public class IpServer extends StateMachine {
mLastRaParams = newParams; mLastRaParams = newParams;
} }
private void logMessage(State state, int what) { private void maybeLogMessage(State state, int what) {
mLog.log(state.getName() + " got " + sMagicDecoderRing.get(what, Integer.toString(what))); switch (what) {
// Suppress some CMD_* to avoid log flooding.
case CMD_IPV6_TETHER_UPDATE:
case CMD_NEIGHBOR_EVENT:
break;
default:
mLog.log(state.getName() + " got "
+ sMagicDecoderRing.get(what, Integer.toString(what)));
}
} }
private void sendInterfaceState(int newInterfaceState) { private void sendInterfaceState(int newInterfaceState) {
@@ -1095,7 +1103,7 @@ public class IpServer extends StateMachine {
@Override @Override
public boolean processMessage(Message message) { public boolean processMessage(Message message) {
logMessage(this, message.what); maybeLogMessage(this, message.what);
switch (message.what) { switch (message.what) {
case CMD_TETHER_REQUESTED: case CMD_TETHER_REQUESTED:
mLastError = TetheringManager.TETHER_ERROR_NO_ERROR; mLastError = TetheringManager.TETHER_ERROR_NO_ERROR;
@@ -1180,7 +1188,6 @@ public class IpServer extends StateMachine {
@Override @Override
public boolean processMessage(Message message) { public boolean processMessage(Message message) {
logMessage(this, message.what);
switch (message.what) { switch (message.what) {
case CMD_TETHER_UNREQUESTED: case CMD_TETHER_UNREQUESTED:
transitionTo(mInitialState); transitionTo(mInitialState);
@@ -1238,7 +1245,7 @@ public class IpServer extends StateMachine {
public boolean processMessage(Message message) { public boolean processMessage(Message message) {
if (super.processMessage(message)) return true; if (super.processMessage(message)) return true;
logMessage(this, message.what); maybeLogMessage(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.");
@@ -1306,7 +1313,7 @@ public class IpServer extends StateMachine {
public boolean processMessage(Message message) { public boolean processMessage(Message message) {
if (super.processMessage(message)) return true; if (super.processMessage(message)) return true;
logMessage(this, message.what); maybeLogMessage(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.");
@@ -1417,7 +1424,7 @@ public class IpServer extends StateMachine {
class WaitingForRestartState extends State { class WaitingForRestartState extends State {
@Override @Override
public boolean processMessage(Message message) { public boolean processMessage(Message message) {
logMessage(this, message.what); maybeLogMessage(this, message.what);
switch (message.what) { switch (message.what) {
case CMD_TETHER_UNREQUESTED: case CMD_TETHER_UNREQUESTED:
transitionTo(mInitialState); transitionTo(mInitialState);