X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fxwalk%2Fruntime%2Fandroid%2Fcore%2Fsrc%2Forg%2Fxwalk%2Fcore%2Fextension%2Fapi%2Fdevice_capabilities%2FDeviceCapabilitiesStorage.java;fp=src%2Fxwalk%2Fruntime%2Fandroid%2Fjava%2Fsrc%2Forg%2Fxwalk%2Fruntime%2Fextension%2Fapi%2Fdevice_capabilities%2FDeviceCapabilitiesStorage.java;h=fc69d88de350cdfb37dc1dd51dee5754ec9245ab;hb=6a8ccb215ae8932b1b59ff751f115e9ccfb4066b;hp=a84b4dcaa831b00f663ab1b169a0e44b74bdfa0a;hpb=d482483c7e386df3f789b1cb1845b73bfcaae2bd;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/xwalk/runtime/android/java/src/org/xwalk/runtime/extension/api/device_capabilities/DeviceCapabilitiesStorage.java b/src/xwalk/runtime/android/core/src/org/xwalk/core/extension/api/device_capabilities/DeviceCapabilitiesStorage.java
similarity index 92%
rename from src/xwalk/runtime/android/java/src/org/xwalk/runtime/extension/api/device_capabilities/DeviceCapabilitiesStorage.java
rename to src/xwalk/runtime/android/core/src/org/xwalk/core/extension/api/device_capabilities/DeviceCapabilitiesStorage.java
index a84b4dc..fc69d88 100644
--- a/src/xwalk/runtime/android/java/src/org/xwalk/runtime/extension/api/device_capabilities/DeviceCapabilitiesStorage.java
+++ b/src/xwalk/runtime/android/core/src/org/xwalk/core/extension/api/device_capabilities/DeviceCapabilitiesStorage.java
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.xwalk.runtime.extension.api.device_capabilities;
+package org.xwalk.core.extension.api.device_capabilities;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.os.Environment;
 import android.os.StatFs;
 import android.util.Log;
@@ -18,7 +20,7 @@ import java.io.File;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.xwalk.runtime.extension.XWalkExtensionContext;
+import org.xwalk.core.extension.XWalkExtensionContext;
 
 class DeviceCapabilitiesStorage {
     private static final String TAG = "DeviceCapabilitiesStorage";
@@ -78,6 +80,7 @@ class DeviceCapabilitiesStorage {
             return file.canRead();
         }
 
+        @SuppressWarnings("deprecation")
         public void updateCapacity() {
             if (!isValid()) {
                 return;
@@ -86,9 +89,16 @@ class DeviceCapabilitiesStorage {
             StatFs stat = new StatFs(mPath);
             // FIXME(halton): After API level 18, use getTotalBytes() and
             // getAvailableBytes() instead
-            long blockSize = stat.getBlockSize();
-            mCapacity = blockSize * stat.getBlockCount();
-            mAvailCapacity = blockSize * stat.getAvailableBlocks();
+            long blockSize;
+            if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR2) {
+                blockSize = stat.getBlockSizeLong();
+                mCapacity = blockSize * stat.getBlockCountLong();
+                mAvailCapacity = blockSize * stat.getAvailableBlocksLong();
+            } else {
+                blockSize = stat.getBlockSize();
+                mCapacity = blockSize * stat.getBlockCount();
+                mAvailCapacity = blockSize * stat.getAvailableBlocks();
+            }
         }
 
         public JSONObject convertToJSON() {