summaryrefslogtreecommitdiffstats
path: root/native
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-12-08 14:46:22 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-08 14:46:22 -0800
commit1542af35976ce121b8a69812ab8dec7b71a0b283 (patch)
treeae7c8471d4c48b835f67a979f45dd5025b6c5c3c /native
parentf4ade58b3eb24c20337ba9608a4b2008fb4a017d (diff)
parentddb76c4644756b31be948d70aaa8ee541dd94999 (diff)
downloadframeworks_base-1542af35976ce121b8a69812ab8dec7b71a0b283.zip
frameworks_base-1542af35976ce121b8a69812ab8dec7b71a0b283.tar.gz
frameworks_base-1542af35976ce121b8a69812ab8dec7b71a0b283.tar.bz2
Merge "Change assets to use 64-bit API"
Diffstat (limited to 'native')
-rw-r--r--native/android/asset_manager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/native/android/asset_manager.cpp b/native/android/asset_manager.cpp
index 3f7c1b6..33f088d 100644
--- a/native/android/asset_manager.cpp
+++ b/native/android/asset_manager.cpp
@@ -201,7 +201,7 @@ off_t AAsset_getRemainingLength(AAsset* asset)
int AAsset_openFileDescriptor(AAsset* asset, off_t* outStart, off_t* outLength)
{
- return asset->mAsset->openFileDescriptor(outStart, outLength);
+ return asset->mAsset->openFileDescriptor((off64_t*)outStart, (off64_t*)outLength);
}
int AAsset_isAllocated(AAsset* asset)