commit bb820475da6437cdc2d976eac3f23c061934a08e
author I-Jui (Ray) Sung <ijsung@google.com> Mon Mar 20 23:01:06 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 20 23:01:08 2017 +0000
tree 5aab7ecfe03a72d3d346afc4c5066fcc2a971ccc
parent e85da7ee02afba733a9e12bff0b776df5831dde3
parent 26a3718d02d4a35be8a2a5f325d7242f8684d79d

Merge "Fix RSTest_CompatLib and handling of RS_ERROR_FATAL_DEBUG"

rsApiStubs.cpp

diff --git a/rsApiStubs.cpp b/rsApiStubs.cpp
index feac2d1..2c9a5ba 100644
--- a/rsApiStubs.cpp
+++ b/rsApiStubs.cpp
@@ -21,6 +21,9 @@
 
 #include <android_runtime/AndroidRuntime.h>
 
+#undef LOG_TAG
+#define LOG_TAG "RenderScript"
+
 // TODO: Figure out how to use different declared types for the two interfaces
 //       to avoid the confusion. Currently, RsContext is used as the API type for
 //       both the client interface and the dispatch table interface, but at the
@@ -96,17 +99,20 @@
                 jfieldID cacheDirID = env->GetStaticFieldID(cacheDirClass, "mCacheDir", "Ljava/io/File;");
                 jobject cache_dir = env->GetStaticObjectField(cacheDirClass, cacheDirID);
 
-                jclass fileClass = env->FindClass("java/io/File");
-                jmethodID getPath = env->GetMethodID(fileClass, "getPath", "()Ljava/lang/String;");
-                jstring path_string = (jstring)env->CallObjectMethod(cache_dir, getPath);
-                const char *path_chars = env->GetStringUTFChars(path_string, NULL);
-                jsize path_length = env->GetStringUTFLength(path_string);
+                if (cache_dir) {
+                    jclass fileClass = env->FindClass("java/io/File");
+                    jmethodID getPath = env->GetMethodID(fileClass, "getPath", "()Ljava/lang/String;");
+                    jstring path_string = (jstring)env->CallObjectMethod(cache_dir, getPath);
+                    const char *path_chars = env->GetStringUTFChars(path_string, NULL);
 
-                ALOGD("Successfully queried cache dir: %s", path_chars);
-                defaultCacheDir = std::string(path_chars);
-                env->ReleaseStringUTFChars(path_string, path_chars);
+                    ALOGD("Successfully queried cache dir: %s", path_chars);
+                    defaultCacheDir = std::string(path_chars);
+                    env->ReleaseStringUTFChars(path_string, path_chars);
+                } else {
+                    ALOGD("Cache dir not initialized");
+                }
             } else {
-                ALOGE("Failed to set the default cache dir.");
+                ALOGD("Failed to query the default cache dir.");
             }
         } else {
             ALOGD("Non JavaVM found in the process.");