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

Commit c21488b2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Allow blocking calls to InstrumentationWatcher" into rvc-dev am: 9e0ea0c9 am: aafa4ff2 

Change-Id: I7c64c3419dd1a3100d5bce71ebc0465a1ee9d818
parents f4379e2e aafa4ff2

services/core/java/com/android/server/am/InstrumentationReporter.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.am; 




import android.app.IInstrumentationWatcher;

import android.app.IInstrumentationWatcher;

import android.content.ComponentName;

import android.content.ComponentName;

import android.os.Binder;

import android.os.Bundle;

import android.os.Bundle;

import android.os.Process;

import android.os.Process;

import android.os.RemoteException;

import android.os.RemoteException;
@@ -109,6 +110,8 @@ public class InstrumentationReporter { 
            mName = name;

            mName = name;

            mResultCode = resultCode;

            mResultCode = resultCode;

            mResults = results;

            mResults = results;



            Binder.allowBlocking(mWatcher.asBinder());

        }

        }

    }

    }