summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2016-11-02 00:29:22 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-11-02 00:29:27 +0000
commit9717839a1fdc0a48adcc59513ae76278e643594c (patch)
tree5201c541a916cb41f9fb2b0c2e5d84cc4eefdb15
parent2e8288f4507331fda4238c2e1e0bb0194f1aef3d (diff)
parent7d6e325b6c2030fb0880bdf2cdecc67bbd2474e1 (diff)
Merge "Revert "Exit enteringAccessoryMode when entered.""
-rw-r--r--services/usb/java/com/android/server/usb/UsbDeviceManager.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index af8c314d3b87..3daa87c07564 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -597,7 +597,6 @@ public class UsbDeviceManager {
mAccessoryModeRequestTime + ACCESSORY_REQUEST_TIMEOUT;
if (mConfigured && enteringAccessoryMode) {
- mAccessoryModeRequestTime = 0;
// successfully entered accessory mode
if (mAccessoryStrings != null) {