diff options
| -rw-r--r-- | core/jni/android_os_SELinux.cpp | 6 | ||||
| -rw-r--r-- | core/jni/com_android_internal_content_NativeLibraryHelper.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/jni/android_os_SELinux.cpp b/core/jni/android_os_SELinux.cpp index 8ba77aed1d04..4b68c0dad038 100644 --- a/core/jni/android_os_SELinux.cpp +++ b/core/jni/android_os_SELinux.cpp @@ -23,9 +23,9 @@ #include "selinux/selinux.h" #include "selinux/android.h" #include <errno.h> +#include <memory> #include <ScopedLocalRef.h> #include <ScopedUtfChars.h> -#include <UniquePtr.h> namespace android { @@ -34,7 +34,7 @@ struct SecurityContext_Delete { freecon(p); } }; -typedef UniquePtr<char[], SecurityContext_Delete> Unique_SecurityContext; +typedef std::unique_ptr<char[], SecurityContext_Delete> Unique_SecurityContext; static jboolean isSELinuxDisabled = true; @@ -112,7 +112,7 @@ static jboolean setFSCreateCon(JNIEnv *env, jobject, jstring contextStr) { return false; } - UniquePtr<ScopedUtfChars> context; + std::unique_ptr<ScopedUtfChars> context; const char* context_c_str = NULL; if (contextStr != NULL) { context.reset(new ScopedUtfChars(env, contextStr)); diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp index 364ac44ee0f6..7e016576d70a 100644 --- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp +++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp @@ -20,7 +20,6 @@ #include "core_jni_helpers.h" #include <ScopedUtfChars.h> -#include <UniquePtr.h> #include <androidfw/ZipFileRO.h> #include <androidfw/ZipUtils.h> #include <utils/Log.h> @@ -37,6 +36,7 @@ #include <sys/stat.h> #include <sys/types.h> +#include <memory> #define APK_LIB "lib/" #define APK_LIB_LEN (sizeof(APK_LIB) - 1) @@ -398,7 +398,7 @@ iterateOverNativeFiles(JNIEnv *env, jlong apkHandle, jstring javaCpuAbi, return INSTALL_FAILED_INVALID_APK; } - UniquePtr<NativeLibrariesIterator> it(NativeLibrariesIterator::create(zipFile)); + std::unique_ptr<NativeLibrariesIterator> it(NativeLibrariesIterator::create(zipFile)); if (it.get() == NULL) { return INSTALL_FAILED_INVALID_APK; } @@ -446,7 +446,7 @@ static int findSupportedAbi(JNIEnv *env, jlong apkHandle, jobjectArray supported return INSTALL_FAILED_INVALID_APK; } - UniquePtr<NativeLibrariesIterator> it(NativeLibrariesIterator::create(zipFile)); + std::unique_ptr<NativeLibrariesIterator> it(NativeLibrariesIterator::create(zipFile)); if (it.get() == NULL) { return INSTALL_FAILED_INVALID_APK; } |