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

Commit 0b822b8b authored by Austin Borger's avatar Austin Borger Committed by Android (Google) Code Review
Browse files

Merge "cameraservice: Migrate all internal String8/String16s to std::string"... 

Merge "cameraservice: Migrate all internal String8/String16s to std::string" into udc-qpr-dev-plus-aosp
parents 721d94ed 07eac69e

core/jni/android_hardware_Camera.cpp

+11 −12
Original line number Diff line number Diff line
@@ -17,22 +17,21 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "Camera-JNI"

#include <utils/Log.h>



#include "jni.h"

#include <nativehelper/JNIHelp.h>

#include "core_jni_helpers.h"

#include <android_runtime/android_graphics_SurfaceTexture.h>

#include <android_runtime/android_view_Surface.h>



#include <binder/IMemory.h>

#include <camera/Camera.h>

#include <camera/StringUtils.h>

#include <cutils/properties.h>

#include <utils/Vector.h>

#include <utils/Errors.h>



#include <gui/GLConsumer.h>

#include <gui/Surface.h>

#include <camera/Camera.h>

#include <binder/IMemory.h>

#include <nativehelper/JNIHelp.h>

#include <utils/Errors.h>

#include <utils/Log.h>

#include <utils/Vector.h>



#include "core_jni_helpers.h"

#include "jni.h"



using namespace android;
@@ -562,7 +561,7 @@ static jint android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz, jobj 
    const char16_t *rawClientName = reinterpret_cast<const char16_t*>(

        env->GetStringChars(clientPackageName, NULL));

    jsize rawClientNameLen = env->GetStringLength(clientPackageName);

    String16 clientName(rawClientName, rawClientNameLen);

    std::string clientName = toStdString(rawClientName, rawClientNameLen);

    env->ReleaseStringChars(clientPackageName,

                            reinterpret_cast<const jchar*>(rawClientName));