fs/AllocatedPath: make the nullptr_t constructor public

This commit is contained in:
Max Kellermann
2018-01-17 12:17:41 +01:00
parent c4f7740b80
commit bbc5212436
24 changed files with 58 additions and 62 deletions

View File

@@ -36,7 +36,7 @@ Context::GetCacheDir(JNIEnv *env) const
jobject file = env->CallObjectMethod(Get(), method);
if (file == nullptr) {
env->ExceptionClear();
return AllocatedPath::Null();
return nullptr;
}
return Java::File::ToAbsolutePath(env, file);

View File

@@ -60,7 +60,7 @@ Environment::getExternalStorageDirectory()
env->CallStaticObjectMethod(cls,
getExternalStorageDirectory_method);
if (file == nullptr)
return AllocatedPath::Null();
return nullptr;
return Java::File::ToAbsolutePath(env, file);
}
@@ -70,7 +70,7 @@ Environment::getExternalStoragePublicDirectory(const char *type)
{
if (getExternalStoragePublicDirectory_method == nullptr)
/* needs API level 8 */
return AllocatedPath::Null();
return nullptr;
JNIEnv *env = Java::GetEnv();
@@ -79,7 +79,7 @@ Environment::getExternalStoragePublicDirectory(const char *type)
Environment::getExternalStoragePublicDirectory_method,
type2.Get());
if (file == nullptr)
return AllocatedPath::Null();
return nullptr;
return Java::File::ToAbsolutePath(env, file);
}