Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa183e2c authored by Kenny Root's avatar Kenny Root
Browse files

Add measurement API to DefaultContainerService 

System applications that don't have "media_rw" access need some way to
measure the size of directories on the SD card and other internal media.
Add this API to DefaultContainerService so they can simply bind to the
service and make an RPC.

Bug: 3203974
Change-Id: I4e1bcd7a1b702b156c011ecc04f6915022cb258a
parent d8b3f2e8

core/java/com/android/internal/app/IMediaContainerService.aidl

+2 −1
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ interface IMediaContainerService { 
                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);

}

packages/DefaultContainerService/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) 


LOCAL_PACKAGE_NAME := DefaultContainerService



LOCAL_JNI_SHARED_LIBRARIES := libdefcontainer_jni



LOCAL_CERTIFICATE := platform



include $(BUILD_PACKAGE)



include $(call all-makefiles-under,$(LOCAL_PATH))

packages/DefaultContainerService/jni/Android.mk

0 → 100644
+39 −0
Original line number Diff line number Diff line 
#

# 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

packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp

0 → 100644
+76 −0
Original line number Diff line number Diff line 
/*

 * 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);

}

packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java

+5 −0
Original line number Diff line number Diff line
@@ -163,6 +163,11 @@ public class DefaultContainerService extends IntentService { 
                return null;

            }

        }



        @Override

        public long calculateDirectorySize(String directory) throws RemoteException {

            return MeasurementUtils.measureDirectory(directory);

        }

    };



    public DefaultContainerService() {