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

Commit 6c3fd821 authored by Carl Shapiro's avatar Carl Shapiro Committed by Android (Google) Code Review
Browse files

Merge "Eliminate an assignment of a local reference to a global variable."

parents 2c219c1d b16f7692

core/jni/android_os_FileUtils.cpp

+15 −16
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 


namespace android {



static jclass gFileStatusClass;

static jfieldID gFileStatusDevFieldID;

static jfieldID gFileStatusInoFieldID;

static jfieldID gFileStatusModeFieldID;
@@ -189,21 +188,21 @@ int register_android_os_FileUtils(JNIEnv* env) 
    clazz = env->FindClass(kFileUtilsPathName);

    LOG_FATAL_IF(clazz == NULL, "Unable to find class android.os.FileUtils");

    

    gFileStatusClass = env->FindClass("android/os/FileUtils$FileStatus");

    LOG_FATAL_IF(gFileStatusClass == NULL, "Unable to find class android.os.FileUtils$FileStatus");



    gFileStatusDevFieldID = env->GetFieldID(gFileStatusClass, "dev", "I");

    gFileStatusInoFieldID = env->GetFieldID(gFileStatusClass, "ino", "I");

    gFileStatusModeFieldID = env->GetFieldID(gFileStatusClass, "mode", "I");

    gFileStatusNlinkFieldID = env->GetFieldID(gFileStatusClass, "nlink", "I");

    gFileStatusUidFieldID = env->GetFieldID(gFileStatusClass, "uid", "I");

    gFileStatusGidFieldID = env->GetFieldID(gFileStatusClass, "gid", "I");

    gFileStatusSizeFieldID = env->GetFieldID(gFileStatusClass, "size", "J");

    gFileStatusBlksizeFieldID = env->GetFieldID(gFileStatusClass, "blksize", "I");

    gFileStatusBlocksFieldID = env->GetFieldID(gFileStatusClass, "blocks", "J");

    gFileStatusAtimeFieldID = env->GetFieldID(gFileStatusClass, "atime", "J");

    gFileStatusMtimeFieldID = env->GetFieldID(gFileStatusClass, "mtime", "J");

    gFileStatusCtimeFieldID = env->GetFieldID(gFileStatusClass, "ctime", "J");

    jclass fileStatusClass = env->FindClass("android/os/FileUtils$FileStatus");

    LOG_FATAL_IF(fileStatusClass == NULL, "Unable to find class android.os.FileUtils$FileStatus");



    gFileStatusDevFieldID = env->GetFieldID(fileStatusClass, "dev", "I");

    gFileStatusInoFieldID = env->GetFieldID(fileStatusClass, "ino", "I");

    gFileStatusModeFieldID = env->GetFieldID(fileStatusClass, "mode", "I");

    gFileStatusNlinkFieldID = env->GetFieldID(fileStatusClass, "nlink", "I");

    gFileStatusUidFieldID = env->GetFieldID(fileStatusClass, "uid", "I");

    gFileStatusGidFieldID = env->GetFieldID(fileStatusClass, "gid", "I");

    gFileStatusSizeFieldID = env->GetFieldID(fileStatusClass, "size", "J");

    gFileStatusBlksizeFieldID = env->GetFieldID(fileStatusClass, "blksize", "I");

    gFileStatusBlocksFieldID = env->GetFieldID(fileStatusClass, "blocks", "J");

    gFileStatusAtimeFieldID = env->GetFieldID(fileStatusClass, "atime", "J");

    gFileStatusMtimeFieldID = env->GetFieldID(fileStatusClass, "mtime", "J");

    gFileStatusCtimeFieldID = env->GetFieldID(fileStatusClass, "ctime", "J");



    return AndroidRuntime::registerNativeMethods(

        env, kFileUtilsPathName,