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

Commit 54303e6b authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am b20d378c: Merge "Don\'t crash during full backup when CheckJNI is enabled" into ics-factoryrom 

* commit 'b20d378c':
  Don't crash during full backup when CheckJNI is enabled
parents c86bc42c b20d378c

core/jni/android_app_backup_FullBackup.cpp

+4 −4
Original line number Diff line number Diff line
@@ -76,10 +76,10 @@ static int backupToTar(JNIEnv* env, jobject clazz, jstring packageNameObj, 
    int ret;



    // Extract the various strings, allowing for null object pointers

    const char* packagenamechars = env->GetStringUTFChars(packageNameObj, NULL);

    const char* rootchars = env->GetStringUTFChars(rootpathObj, NULL);

    const char* pathchars = env->GetStringUTFChars(pathObj, NULL);

    const char* domainchars = env->GetStringUTFChars(domainObj, NULL);

    const char* packagenamechars = (packageNameObj) ? env->GetStringUTFChars(packageNameObj, NULL) : NULL;

    const char* rootchars = (rootpathObj) ? env->GetStringUTFChars(rootpathObj, NULL) : NULL;

    const char* pathchars = (pathObj) ? env->GetStringUTFChars(pathObj, NULL) : NULL;

    const char* domainchars = (domainObj) ? env->GetStringUTFChars(domainObj, NULL) : NULL;



    String8 packageName(packagenamechars ? packagenamechars : "");

    String8 rootpath(rootchars ? rootchars : "");