[androiddebugbridge] fix power wake lock and minor fixes (#10316)

Signed-off-by: Miguel <miguelwork92@gmail.com>
This commit is contained in:
GiviMAD 2021-03-13 20:26:57 +01:00 committed by GitHub
parent f085dc02a1
commit affc082fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -6,7 +6,7 @@ If you are not familiar with adb I suggest you to search "How to enable adb over
## Supported Things
This binding was tested on the Fire TV Stick (android version 7.1.2, volume control not working) and Nexus5x (android version 8.1.0, everything works nice), please update this document if you tested it with other android versions to reflect the compatibility of the biding.
This binding was tested on the Fire TV Stick (android version 7.1.2, volume control not working) and Nexus5x (android version 8.1.0, everything works nice), please update this document if you tested it with other android versions to reflect the compatibility of the binding.
## Discovery

View File

@ -117,7 +117,7 @@ public class AndroidDebugBridgeDevice {
if (packageActivityName.contains("/"))
return packageActivityName.split("/")[0];
}
throw new AndroidDebugBridgeDeviceReadException("can read package name");
throw new AndroidDebugBridgeDeviceReadException("Unable to read package name");
}
public boolean isAwake()
@ -137,7 +137,7 @@ public class AndroidDebugBridgeDevice {
logger.debug("Unable to parse device wake lock: {}", e.getMessage());
}
}
throw new AndroidDebugBridgeDeviceReadException("can read screen state");
throw new AndroidDebugBridgeDeviceReadException("Unable to read screen state");
}
public boolean isPlayingMedia(String currentApp)
@ -175,12 +175,12 @@ public class AndroidDebugBridgeDevice {
String lockResp = runAdbShell("dumpsys", "power", "|", "grep", "Locks", "|", "grep", "'size='");
if (lockResp.contains("=")) {
try {
return Integer.parseInt(lockResp.replace("\n", "").split("=")[1]);
return Integer.parseInt(lockResp.replace("\n", "").split("=")[1].trim());
} catch (NumberFormatException e) {
logger.debug("Unable to parse device wake lock: {}", e.getMessage());
}
}
throw new AndroidDebugBridgeDeviceReadException("can read wake lock");
throw new AndroidDebugBridgeDeviceReadException("Unable to read wake lock");
}
private void setVolume(int stream, int volume)