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

Fix problem with usb mode summary not updated correctly.

Browse Source 
In UsbBackend, do not cache the usb state, but re-read it everytime when
we try to get the usb data mode.

Change-Id: I6f2863a59ee8df2c50901a630e3e145714c7dc46
Fix: 34234065
Test: make RunSettingsRoboTests
This commit is contained in:
Doris Ling
2017-02-17 15:22:13 -08:00
parent ad36812e88
commit 21711681ea
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ public class UsbBackend {
private UsbPort mPort;
private UsbPortStatus mPortStatus;
private boolean mIsUnlocked;
private Context mContext;
public UsbBackend(Context context) {
this(context, new UserRestrictionUtil(context));
@@ -54,11 +54,7 @@ public class UsbBackend {
@VisibleForTesting
UsbBackend(Context context, UserRestrictionUtil userRestrictionUtil) {
Intent intent = context.registerReceiver(null,
new IntentFilter(UsbManager.ACTION_USB_STATE));
mIsUnlocked = intent == null ?
false : intent.getBooleanExtra(UsbManager.USB_DATA_UNLOCKED, false);
mContext = context;
mUsbManager = context.getSystemService(UsbManager.class);
mRestricted = userRestrictionUtil.isUsbFileTransferRestricted();
@@ -92,7 +88,7 @@ public class UsbBackend {
}
public int getUsbDataMode() {
if (!mIsUnlocked) {
if (!isUsbDataUnlocked()) {
return MODE_DATA_NONE;
} else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) {
return MODE_DATA_MTP;
@@ -104,6 +100,13 @@ public class UsbBackend {
return MODE_DATA_NONE; // ...
}
private boolean isUsbDataUnlocked() {
Intent intent = mContext.registerReceiver(null,
new IntentFilter(UsbManager.ACTION_USB_STATE));
return intent == null ?
false : intent.getBooleanExtra(UsbManager.USB_DATA_UNLOCKED, false);
}
private void setUsbFunction(int mode) {
switch (mode) {
case MODE_DATA_MTP: