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

Merge "Better detecting if current threasd is main thread"

Browse Source
This commit is contained in:
Kristian Monsen
2013-01-18 23:57:47 +00:00
committed by Android (Google) Code Review
parent 70b900cded 0a30328c10
commit 21af9258f3
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/Instrumentation.java
View File

@@ -27,6 +27,7 @@ import android.hardware.input.InputManager;
import android.os.Bundle;
import android.os.Debug;
import android.os.IBinder;
import android.os.Looper;
import android.os.MessageQueue;
import android.os.PerformanceCollector;
import android.os.Process;
@@ -1637,7 +1638,7 @@ public class Instrumentation {
}
private final void validateNotAppThread() {
if (ActivityThread.currentActivityThread() != null) {
if (Looper.myLooper() == Looper.getMainLooper()) {
throw new RuntimeException(
"This method can not be called from the main application thread");
}

3
tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java
View File

@@ -21,6 +21,7 @@ import android.app.ActivityThread;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.util.Log;
import android.view.ViewGroup;
@@ -180,7 +181,7 @@ public class PowerTestActivity extends Activity {
}
private final void validateNotAppThread() {
if (ActivityThread.currentActivityThread() != null) {
if (Looper.myLooper() == Looper.getMainLooper()) {
throw new RuntimeException(
"This method can not be called from the main application thread");
}

3
tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java
View File

@@ -22,6 +22,7 @@ import android.graphics.Bitmap;
import android.net.http.SslError;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.util.Log;
import android.view.ViewGroup;
@@ -184,7 +185,7 @@ public class ReliabilityTestActivity extends Activity {
}
private final void validateNotAppThread() {
if (ActivityThread.currentActivityThread() != null) {
if (Looper.myLooper() == Looper.getMainLooper()) {
throw new RuntimeException(
"This method can not be called from the main application thread");
}