summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-08-09 19:28:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-08-09 19:28:49 +0000
commit15fbf9786dbdcd20475b0c12940139ad3d66b6e2 (patch)
tree9bbed2c9984ba2b9978e308017c83897a5a2e9cf
parent33e014b9bc0b609a8b6498bccf36536f3e0c5557 (diff)
parent1290568110405fd45f13824e67beeb98c30400a4 (diff)
Merge "Add future consideration for USB rndis notification handling" into oc-dr1-dev
-rw-r--r--services/core/java/com/android/server/connectivity/Tethering.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index 015f7f077808..2b4f4e6a75f7 100644
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -834,6 +834,16 @@ public class Tethering extends BaseNetworkObserver {
// For more explanation, see b/62552150 .
synchronized (Tethering.this.mPublicSync) {
// Always record the state of RNDIS.
+ // TODO: consider:
+ // final boolean disconnected = !usbConnected;
+ // if (disconnected) {
+ // mRndisEnabled = false;
+ // mUsbTetherRequested = false;
+ // return;
+ // }
+ // final boolean configured = usbConnected && usbConfigured;
+ // mRndisEnabled = configured ? rndisEnabled : false;
+ // if (!configured) return;
mRndisEnabled = rndisEnabled;
if (usbConnected && !usbConfigured) {