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

Change-Id: Idfb9a39f526ee95bf3f10722724601d33ba6a735
2020-02-28 17:40:31 +00:00
parent b09e86b45f 9e0ea0c953
commit eea08a9895
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());
        }
    }