mojo/android/system/core_impl.cc - Issue 830593003: Update mojo sdk to rev 9fbbc4f0fef1187312316c0ed992342474e139f1

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/android/system/core_impl.cc

Issue 830593003: Update mojo sdk to rev 9fbbc4f0fef1187312316c0ed992342474e139f1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: cherry-pick mojo 9d3b8dd17f12d20035a14737fdc38dd926890ff8 Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « mojo/android/javatests/src/org/chromium/mojo/bindings/ValidationTestUtilTest.java ('k') | mojo/android/system/src/org/chromium/mojo/system/impl/CoreImpl.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/android/system/core_impl.cc

diff --git a/mojo/android/system/core_impl.cc b/mojo/android/system/core_impl.cc

index 35d1b3682cac2aa723d3503e9ff69016758e2829..55a374e50bcba68e1bff0ef41548c9278b2052a6 100644

--- a/mojo/android/system/core_impl.cc

+++ b/mojo/android/system/core_impl.cc

@@ -84,8 +84,8 @@ static jint WaitMany(JNIEnv* env,

uint32_t* result_index =

reinterpret_cast<uint32_t*>(buffer_start + 16 * nb_handles);

*result_index = static_cast<uint32_t>(-1);

- return MojoNewWaitMany(handle_start, signals_start, nb_handles, deadline,

- result_index, states_start);

+ return MojoWaitMany(handle_start, signals_start, nb_handles, deadline,

+ result_index, states_start);

}

static jobject CreateMessagePipe(JNIEnv* env,

@@ -166,7 +166,7 @@ static jint Wait(JNIEnv* env,

static_cast<size_t>(env->GetDirectBufferCapacity(buffer)));

struct MojoHandleSignalsState* signals_state =

static_cast<struct MojoHandleSignalsState*>(buffer_start);

- return MojoNewWait(mojo_handle, signals, deadline, signals_state);

+ return MojoWait(mojo_handle, signals, deadline, signals_state);

}

static jint WriteMessage(JNIEnv* env,