Skip to content

Update LegacyUsbDeviceManager.java #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shuiqingliu wants to merge 1 commit into
base: cm-10.1
Choose a base branch
from
Open

Update LegacyUsbDeviceManager.java #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions services/java/com/android/server/usb/LegacyUsbDeviceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ public class LegacyUsbDeviceManager extends UsbDeviceManager {
private boolean mUseUsbNotification;
private boolean mAdbEnabled;
private boolean mLegacy = false;
<<<<<<< HEAD

private boolean mHasUsbService = false;
=======
>>>>>>> cyanogen/cm-10.1


private UsbDebuggingManager mDebuggingManager;

private class AdbSettingsObserver extends ContentObserver {
Expand Down