Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2110)

Unified Diff: base/android/java/src/org/chromium/base/JavaHandlerThread.java

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Supress Created 5 years, 9 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
Index: base/android/java/src/org/chromium/base/JavaHandlerThread.java
diff --git a/base/android/java/src/org/chromium/base/JavaHandlerThread.java b/base/android/java/src/org/chromium/base/JavaHandlerThread.java
index 9643a6325c3cdf6f5186398dff9a589a12fb0e5d..3153a9bdd97f898355c78605ce2eb712ce8e6dcc 100644
--- a/base/android/java/src/org/chromium/base/JavaHandlerThread.java
+++ b/base/android/java/src/org/chromium/base/JavaHandlerThread.java
@@ -4,6 +4,8 @@
package org.chromium.base;
+import android.annotation.TargetApi;
+import android.os.Build;
import android.os.Handler;
import android.os.HandlerThread;
@@ -35,15 +37,18 @@ class JavaHandlerThread {
});
}
+ @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
@CalledByNative
private void stop(final long nativeThread, final long nativeEvent) {
+ final boolean quitSafely = Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2;
new Handler(mThread.getLooper()).post(new Runnable() {
@Override
public void run() {
nativeStopThread(nativeThread, nativeEvent);
+ if (!quitSafely) mThread.quit();
}
});
- mThread.quitSafely();
+ if (quitSafely) mThread.quitSafely();
}
private native void nativeInitializeThread(long nativeJavaHandlerThread, long nativeEvent);

Powered by Google App Engine
This is Rietveld 408576698