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

Commit 53277e97 authored by Kristian Monsen's avatar Kristian Monsen Committed by Android Git Automerger
Browse files

am 21af9258: Merge "Better detecting if current threasd is main thread" 

* commit '21af9258':
  Better detecting if current threasd is main thread
parents b113273a 21af9258

core/java/android/app/Instrumentation.java

+2 −1
Original line number Diff line number Diff line
@@ -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");

        }

tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -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");

        }

tests/DumpRenderTree/src/com/android/dumprendertree/ReliabilityTestActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -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");

        }