PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 1adca55f to mnc-dr-dev

Browse Source 
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
This commit is contained in:
Jason Monk
2015-08-04 16:23:32 -04:00
parent 2e3775b9b1 1adca55ffe
commit 9824c5da1e
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/deviceinfo/UsbBackend.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.deviceinfo;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.hardware.usb.UsbManager;
import android.hardware.usb.UsbPort;
import android.hardware.usb.UsbPortStatus;
@@ -40,7 +42,13 @@ public class UsbBackend {
private UsbPort mPort;
private UsbPortStatus mPortStatus;
private boolean mIsUnlocked;
public UsbBackend(Context context) {
Intent intent = context.registerReceiver(null,
new IntentFilter(UsbManager.ACTION_USB_STATE));
mIsUnlocked = intent.getBooleanExtra(UsbManager.USB_DATA_UNLOCKED, false);
mUserManager = UserManager.get(context);
mUsbManager = context.getSystemService(UsbManager.class);
@@ -70,7 +78,7 @@ public class UsbBackend {
}
public int getUsbDataMode() {
if (!mUsbManager.isUsbDataUnlocked()) {
if (!mIsUnlocked) {
return MODE_DATA_NONE;
} else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) {
return MODE_DATA_MTP;
@@ -123,7 +131,8 @@ public class UsbBackend {
}
public boolean isModeSupported(int mode) {
if (mRestricted && (mode & MODE_DATA_MASK) != MODE_DATA_NONE) {
if (mRestricted && (mode & MODE_DATA_MASK) != MODE_DATA_NONE
&& (mode & MODE_DATA_MASK) != MODE_DATA_MIDI) {
// No USB data modes are supported.
return false;
}