Merge "Add measurement API to DefaultContainerService"
diff --git a/core/java/com/android/internal/app/IMediaContainerService.aidl b/core/java/com/android/internal/app/IMediaContainerService.aidl
index 5d1f632..aee1626 100755
--- a/core/java/com/android/internal/app/IMediaContainerService.aidl
+++ b/core/java/com/android/internal/app/IMediaContainerService.aidl
@@ -29,5 +29,6 @@
in ParcelFileDescriptor outStream);
PackageInfoLite getMinimalPackageInfo(in Uri fileUri, int flags);
boolean checkFreeStorage(boolean external, in Uri fileUri);
- ObbInfo getObbInfo(String filename);
+ ObbInfo getObbInfo(in String filename);
+ long calculateDirectorySize(in String directory);
}
diff --git a/packages/DefaultContainerService/Android.mk b/packages/DefaultContainerService/Android.mk
index 2f1d6ab..986b6c8 100755
--- a/packages/DefaultContainerService/Android.mk
+++ b/packages/DefaultContainerService/Android.mk
@@ -7,6 +7,10 @@
LOCAL_PACKAGE_NAME := DefaultContainerService
+LOCAL_JNI_SHARED_LIBRARIES := libdefcontainer_jni
+
LOCAL_CERTIFICATE := platform
include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/packages/DefaultContainerService/jni/Android.mk b/packages/DefaultContainerService/jni/Android.mk
new file mode 100644
index 0000000..a2febec
--- /dev/null
+++ b/packages/DefaultContainerService/jni/Android.mk
@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PRELINK_MODULE := false
+
+LOCAL_SRC_FILES := \
+ com_android_defcontainer_MeasurementUtils.cpp
+
+LOCAL_C_INCLUDES += \
+ $(JNI_H_INCLUDES)
+
+LOCAL_SHARED_LIBRARIES := \
+ libnativehelper \
+ libutils
+
+LOCAL_STATIC_LIBRARIES := \
+ libdiskusage
+
+LOCAL_MODULE := libdefcontainer_jni
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp b/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp
new file mode 100644
index 0000000..6579f95
--- /dev/null
+++ b/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define LOG_TAG "DefContainer-JNI"
+
+#include <JNIHelp.h>
+
+#include <diskusage/dirsize.h>
+#include <utils/Log.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+
+namespace android {
+
+static jlong native_measureDirectory(JNIEnv* env, jobject clazz, jstring directory) {
+ jlong ret = 0L;
+
+ const char* path = env->GetStringUTFChars(directory, NULL);
+ if (path == NULL) {
+ return ret;
+ }
+
+ int dirfd = open(path, O_DIRECTORY, O_RDONLY);
+ if (dirfd < 0) {
+ LOGI("error opening: %s: %s", path, strerror(errno));
+ } else {
+ ret = calculate_dir_size(dirfd);
+ close(dirfd);
+ }
+
+ env->ReleaseStringUTFChars(directory, path);
+
+ return ret;
+}
+
+static const JNINativeMethod g_methods[] = {
+ { "native_measureDirectory", "(Ljava/lang/String;)J", (void*)native_measureDirectory },
+};
+
+int register_com_android_defcontainer(JNIEnv *env) {
+ if (jniRegisterNativeMethods(
+ env, "com/android/defcontainer/MeasurementUtils", g_methods, NELEM(g_methods)) < 0) {
+ return JNI_ERR;
+ }
+
+ return JNI_VERSION_1_6;
+}
+
+} // namespace android
+
+int JNI_OnLoad(JavaVM *jvm, void* reserved) {
+ JNIEnv *env;
+
+ if (jvm->GetEnv((void**)&env, JNI_VERSION_1_6)) {
+ return JNI_ERR;
+ }
+
+ return android::register_com_android_defcontainer(env);
+}
diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
index e6624ae..0c85af8 100644
--- a/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
+++ b/packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
@@ -163,6 +163,11 @@
return null;
}
}
+
+ @Override
+ public long calculateDirectorySize(String directory) throws RemoteException {
+ return MeasurementUtils.measureDirectory(directory);
+ }
};
public DefaultContainerService() {
diff --git a/packages/DefaultContainerService/src/com/android/defcontainer/MeasurementUtils.java b/packages/DefaultContainerService/src/com/android/defcontainer/MeasurementUtils.java
new file mode 100644
index 0000000..6f5f53b
--- /dev/null
+++ b/packages/DefaultContainerService/src/com/android/defcontainer/MeasurementUtils.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.defcontainer;
+
+public class MeasurementUtils {
+ static {
+ System.loadLibrary("defcontainer_jni");
+ }
+
+ public static long measureDirectory(String path) {
+ return native_measureDirectory(path);
+ }
+
+ private native static long native_measureDirectory(String path);
+}