Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1158047 - [AutoMounter] Resolve the problem of stucking in UMS_CONFIGURING state. r=dhylands

Browse Source
This commit is contained in:
Alphan Chen 2015-05-04 14:46:16 +08:00
parent a9a046c31a
commit 43d1609673
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dom/system/gonk/AutoMounter.cpp
View File

@ -845,6 +845,16 @@ AutoMounter::UpdateState()
break;
case STATE_UMS_CONFIGURING:
if (mtpEnabled) {
// MTP was enabled. Start reconfiguring.
SetState(STATE_MTP_CONFIGURING);
SetUsbFunction(USB_FUNC_MTP);
break;
}
if (rndisConfigured) {
SetState(STATE_RNDIS_CONFIGURED);
break;
}
// While configuring, the USB configuration state will change from
// CONFIGURED -> CONNECTED -> DISCONNECTED -> CONNECTED -> CONFIGURED
// so we don't check for cable unplugged here. However, having said
@ -853,18 +863,8 @@ AutoMounter::UpdateState()
// in. This is why we need to check for mtpEnabled once we get the
// configured event.
if (umsConfigured) {
if (mtpEnabled) {
// MTP was enabled. Start reconfiguring.
SetState(STATE_MTP_CONFIGURING);
SetUsbFunction(USB_FUNC_MTP);
break;
}
SetState(STATE_UMS_CONFIGURED);
}
if (rndisConfigured) {
SetState(STATE_RNDIS_CONFIGURED);
break;
}
break;
case STATE_UMS_CONFIGURED:
@ -1119,6 +1119,7 @@ void AutoMounter::GetStatus(bool& umsAvail, bool& umsConfigured, bool& umsEnable
bool& mtpAvail, bool& mtpConfigured, bool& mtpEnabled,
bool& rndisConfigured)
{
umsAvail = false;
umsConfigured = false;
umsEnabled = false;
mtpAvail = false;