diff options
| author | Christopher Tate <ctate@google.com> | 2011-09-23 13:21:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-23 13:21:07 -0700 |
| commit | 54303e6b2361e2fbfe889f4464074c89763f7ab1 (patch) | |
| tree | c023b070139f5001b2858a262fb8d17a14a2ccee /core | |
| parent | c86bc42cb1b910c1150c8f5aa74c1c160c1359e3 (diff) | |
| parent | b20d378cec09da18301eb9c33bc88251beb81042 (diff) | |
| download | frameworks_base-54303e6b2361e2fbfe889f4464074c89763f7ab1.zip frameworks_base-54303e6b2361e2fbfe889f4464074c89763f7ab1.tar.gz frameworks_base-54303e6b2361e2fbfe889f4464074c89763f7ab1.tar.bz2 | |
am b20d378c: Merge "Don\'t crash during full backup when CheckJNI is enabled" into ics-factoryrom
* commit 'b20d378cec09da18301eb9c33bc88251beb81042':
Don't crash during full backup when CheckJNI is enabled
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_app_backup_FullBackup.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/jni/android_app_backup_FullBackup.cpp b/core/jni/android_app_backup_FullBackup.cpp index b36fa3e..6ef62a9 100644 --- a/core/jni/android_app_backup_FullBackup.cpp +++ b/core/jni/android_app_backup_FullBackup.cpp @@ -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 : ""); |