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

Merge "UsbDeviceManager: Initialize state based on persist.sys.usb.config rather than current kernel state"

Browse Source
This commit is contained in:
Mike Lockwood
2011-07-11 15:52:06 -07:00
committed by Android (Google) Code Review
parent ac7f69bac3 c264afeb55
commit 8f540d4d02
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,19 +251,18 @@ public class UsbDeviceManager {
public UsbHandler() {
try {
// persist.sys.usb.config should never be unset. But if it is, set it to "adb"
// so we have a chance of debugging what happened.
mDefaultFunctions = SystemProperties.get("persist.sys.usb.config", "adb");
// 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);
if (!config.equals(mDefaultFunctions)) {
Slog.w(TAG, "resetting config to persistent property: " + mDefaultFunctions);
SystemProperties.set("sys.usb.config", mDefaultFunctions);
}
// Read initial USB state
mCurrentFunctions = FileUtils.readTextFile(
new File(FUNCTIONS_PATH), 0, null).trim();
mDefaultFunctions = mCurrentFunctions;
mCurrentFunctions = mDefaultFunctions;
String state = FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim();
updateState(state);
mAdbEnabled = containsFunction(mCurrentFunctions, UsbManager.USB_FUNCTION_ADB);