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

Merge "UsbDeviceManager: Reset sys.usb.config if it is "none" at boot"

Browse Source
This commit is contained in:
Mike Lockwood
2011-07-01 12:01:15 -07:00
committed by Android (Google) Code Review
parent efc8345369 de296f6448
commit eb26c934a1
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -224,14 +224,22 @@ public class UsbDeviceManager {
private static final int NOTIFICATION_ADB = 4;
public UsbHandler() {
// Read initial USB state
try {
// sanity check the sys.usb.config system property
// this may be necessary if we crashed while switching USB configurations
String config = SystemProperties.get("sys.usb.config", "none");
if (config.equals("none")) {
String persistConfig = SystemProperties.get("persist.sys.usb.config", "none");
Slog.w(TAG, "resetting config to persistent property: " + persistConfig);
SystemProperties.set("sys.usb.config", persistConfig);
}
// Read initial USB state
mCurrentFunctions = FileUtils.readTextFile(
new File(FUNCTIONS_PATH), 0, null).trim();
mDefaultFunctions = mCurrentFunctions;
String state = FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim();
updateState(state);
mAdbEnabled = containsFunction(mCurrentFunctions, UsbManager.USB_FUNCTION_ADB);
// Upgrade step for previous versions that used persist.service.adb.enable
@@ -341,6 +349,7 @@ public class UsbDeviceManager {
}
private void setAdbEnabled(boolean enable) {
if (DEBUG) Slog.d(TAG, "setAdbEnabled: " + enable);
if (enable != mAdbEnabled) {
mAdbEnabled = enable;
String functions;