openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "adbd: demote CHECKs to warning logs." am: 16f4a033c3 

am: 887e8f4bfd

Change-Id: Ic950499166a3e520253eed9a18ac46671c32908c
This commit is contained in:
Josh Gao 2019-04-02 15:24:05 -07:00 committed by android-build-merger
parent 7f724ad4e9 887e8f4bfd
commit 8cecb02a2c
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
adb/daemon/usb.cpp
View File

@ -304,33 +304,57 @@ struct UsbFfsConnection : public Connection {
switch (event.type) {
case FUNCTIONFS_BIND:
CHECK(!bound) << "received FUNCTIONFS_BIND while already bound?";
CHECK(!enabled) << "received FUNCTIONFS_BIND while already enabled?";
bound = true;
if (bound) {
LOG(WARNING) << "received FUNCTIONFS_BIND while already bound?";
running = false;
}
if (enabled) {
LOG(WARNING) << "received FUNCTIONFS_BIND while already enabled?";
running = false;
}
bound = true;
break;
case FUNCTIONFS_ENABLE:
CHECK(bound) << "received FUNCTIONFS_ENABLE while not bound?";
CHECK(!enabled) << "received FUNCTIONFS_ENABLE while already enabled?";
enabled = true;
if (!bound) {
LOG(WARNING) << "received FUNCTIONFS_ENABLE while not bound?";
running = false;
}
if (enabled) {
LOG(WARNING) << "received FUNCTIONFS_ENABLE while already enabled?";
running = false;
}
enabled = true;
StartWorker();
break;
case FUNCTIONFS_DISABLE:
CHECK(bound) << "received FUNCTIONFS_DISABLE while not bound?";
CHECK(enabled) << "received FUNCTIONFS_DISABLE while not enabled?";
enabled = false;
if (!bound) {
LOG(WARNING) << "received FUNCTIONFS_DISABLE while not bound?";
}
if (!enabled) {
LOG(WARNING) << "received FUNCTIONFS_DISABLE while not enabled?";
}
enabled = false;
running = false;
break;
case FUNCTIONFS_UNBIND:
CHECK(!enabled) << "received FUNCTIONFS_UNBIND while still enabled?";
CHECK(bound) << "received FUNCTIONFS_UNBIND when not bound?";
bound = false;
if (enabled) {
LOG(WARNING) << "received FUNCTIONFS_UNBIND while still enabled?";
}
if (!bound) {
LOG(WARNING) << "received FUNCTIONFS_UNBIND when not bound?";
}
bound = false;
running = false;
break;
}