Merge "Allow blocking calls to InstrumentationWatcher" into rvc-dev am: 9e0ea0c953 am: aafa4ff23a

Change-Id: I49e2fffa50a761b293fb8980096aa46816a833af
2020-02-28 18:04:54 +00:00
parent ee489d0067 aafa4ff23a
commit 1d03106acc
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/am/InstrumentationReporter.java
+++ b/services/core/java/com/android/server/am/InstrumentationReporter.java
@@ -18,6 +18,7 @@ package com.android.server.am;

 import android.app.IInstrumentationWatcher;
 import android.content.ComponentName;
+import android.os.Binder;
 import android.os.Bundle;
 import android.os.Process;
 import android.os.RemoteException;
@@ -109,6 +110,8 @@ public class InstrumentationReporter {
            mName = name;
            mResultCode = resultCode;
            mResults = results;
+
+            Binder.allowBlocking(mWatcher.asBinder());
        }
    }