Merge "Support is_recording on R OS" into sc-dev
diff --git a/apex/Android.bp b/apex/Android.bp
index a5e9942..cb6da5f 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -17,7 +17,7 @@
apex_defaults {
name: "com.android.mediaprovider-defaults",
- java_libs: ["framework-mediaprovider"],
+ bootclasspath_fragments: ["com.android.mediaprovider-bootclasspath-fragment"],
key: "com.android.mediaprovider.key",
certificate: ":com.android.mediaprovider.certificate",
file_contexts: ":com.android.mediaprovider-file_contexts",
@@ -45,3 +45,10 @@
"framework-mediaprovider",
],
}
+
+// Encapsulate the contributions made by the com.android.mediaprovider to the bootclasspath.
+bootclasspath_fragment {
+ name: "com.android.mediaprovider-bootclasspath-fragment",
+ contents: ["framework-mediaprovider"],
+ apex_available: ["com.android.mediaprovider"],
+}
diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json
index 6d8da53..d87ce8d 100644
--- a/apex/apex_manifest.json
+++ b/apex/apex_manifest.json
@@ -1,4 +1,4 @@
{
"name": "com.android.mediaprovider",
- "version": 309999900
+ "version": 309999910
}
diff --git a/jni/FuseDaemon.cpp b/jni/FuseDaemon.cpp
index a482e01..833e9c6 100755
--- a/jni/FuseDaemon.cpp
+++ b/jni/FuseDaemon.cpp
@@ -749,13 +749,8 @@
ATRACE_CALL();
struct fuse* fuse = get_fuse(req);
- if (mode) {
- fuse_reply_err(req, EOPNOTSUPP);
- return;
- }
-
handle* h = reinterpret_cast<handle*>(fi->fh);
- auto err = posix_fallocate(h->fd, offset, length);
+ auto err = fallocate(h->fd, mode, offset, length);
fuse_reply_err(req, err);
}