Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use unique_ptr when creating InputChannel"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-21 23:22:12 +00:00
committed by Android (Google) Code Review
parent e5db76d906 2e82e62cdc
commit f91ae5de5d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/android_view_InputChannel.cpp
View File

@@ -122,8 +122,8 @@ static jlongArray android_view_InputChannel_nativeOpenInputChannelPair(JNIEnv* e
ScopedUtfChars nameChars(env, nameObj);
std::string name = nameChars.c_str();
std::shared_ptr<InputChannel> serverChannel;
std::shared_ptr<InputChannel> clientChannel;
std::unique_ptr<InputChannel> serverChannel;
std::unique_ptr<InputChannel> clientChannel;
status_t result = InputChannel::openInputChannelPair(name, serverChannel, clientChannel);
if (result) {
@@ -139,12 +139,12 @@ static jlongArray android_view_InputChannel_nativeOpenInputChannelPair(JNIEnv* e
}
jlong* outArray = env->GetLongArrayElements(channelPair, 0);
outArray[0] = android_view_InputChannel_createInputChannel(env, serverChannel);
outArray[0] = android_view_InputChannel_createInputChannel(env, std::move(serverChannel));
if (env->ExceptionCheck()) {
return nullptr;
}
outArray[1] = android_view_InputChannel_createInputChannel(env, clientChannel);
outArray[1] = android_view_InputChannel_createInputChannel(env, std::move(clientChannel));
if (env->ExceptionCheck()) {
return nullptr;
}