summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-08-03 18:35:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-03 18:35:33 -0700
commit5564334aa5401e22fb1afc8fe5e55d4d3e7f53c3 (patch)
treefb757ca586e838d6eb1007a5487f71243c9a2104 /services
parente2e7b1e2dc31f9e3be0bc44b999227937282f935 (diff)
parent1984e79d1593b80adf46b16666862f5787157aed (diff)
downloadframeworks_base-5564334aa5401e22fb1afc8fe5e55d4d3e7f53c3.zip
frameworks_base-5564334aa5401e22fb1afc8fe5e55d4d3e7f53c3.tar.gz
frameworks_base-5564334aa5401e22fb1afc8fe5e55d4d3e7f53c3.tar.bz2
Merge "UsbDeviceManager: Fix typo that broke adb on/off setting persistence"
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/usb/UsbDeviceManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/usb/UsbDeviceManager.java b/services/java/com/android/server/usb/UsbDeviceManager.java
index 86de880..91c5e33 100644
--- a/services/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/java/com/android/server/usb/UsbDeviceManager.java
@@ -382,7 +382,7 @@ public class UsbDeviceManager {
mAdbEnabled = enable;
// Due to the persist.sys.usb.config property trigger, changing adb state requires
// switching to default function
- setEnabledFunctions(mDefaultFunctions, false);
+ setEnabledFunctions(mDefaultFunctions, true);
updateAdbNotification();
}
}