From a9940d79295ad54bb3ab7341f52dbc235f379f93 Mon Sep 17 00:00:00 2001 From: draekko Date: Sun, 23 Aug 2015 16:42:13 -0400 Subject: [PATCH 1/2] Update RootToolsInternalMethods.java == 2015-08-23 == Updated hasEnoughSpaceOnSdCard() to use new API call for android-18+. --- .../RootTools/internal/RootToolsInternalMethods.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/RootTools/src/com/stericson/RootTools/internal/RootToolsInternalMethods.java b/RootTools/src/com/stericson/RootTools/internal/RootToolsInternalMethods.java index 1636d3b..961cf88 100644 --- a/RootTools/src/com/stericson/RootTools/internal/RootToolsInternalMethods.java +++ b/RootTools/src/com/stericson/RootTools/internal/RootToolsInternalMethods.java @@ -1231,8 +1231,15 @@ public boolean hasEnoughSpaceOnSdCard(long updateSize) } File path = Environment.getExternalStorageDirectory(); StatFs stat = new StatFs(path.getPath()); - long blockSize = stat.getBlockSize(); - long availableBlocks = stat.getAvailableBlocks(); + long blockSize = 0; + long availableBlocks = 0; + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) { + blockSize = stat.getBlockSize(); + availableBlocks = stat.getAvailableBlocks(); + } else { + blockSize = stat.getBlockSizeLong(); + availableBlocks = stat.getAvailableBlocksLong(); + } return (updateSize < availableBlocks * blockSize); } From b0b09753e434e38c4ba665591656589b7f90e34e Mon Sep 17 00:00:00 2001 From: draekko Date: Sun, 23 Aug 2015 16:50:44 -0400 Subject: [PATCH 2/2] Update RootToolsInternalMethods.java == 2015-08-23 == Suppress deprecation warning in hasEnoughSpaceOnSdCard() --- .../stericson/RootTools/internal/RootToolsInternalMethods.java | 1 + 1 file changed, 1 insertion(+) diff --git a/RootTools/src/com/stericson/RootTools/internal/RootToolsInternalMethods.java b/RootTools/src/com/stericson/RootTools/internal/RootToolsInternalMethods.java index 961cf88..7f79937 100644 --- a/RootTools/src/com/stericson/RootTools/internal/RootToolsInternalMethods.java +++ b/RootTools/src/com/stericson/RootTools/internal/RootToolsInternalMethods.java @@ -1221,6 +1221,7 @@ else if (RootTools.checkUtil("toolbox")) * space on SDCard. Will also return false, if the SDCard is not mounted as * read/write */ + @SuppressWarnings("deprecation") public boolean hasEnoughSpaceOnSdCard(long updateSize) { RootTools.log("Checking SDcard size and that it is mounted as RW");