Merge "LogcatManagerService: Allow instrumentation tests"

2022-02-17 00:34:18 +00:00
parent 9395860fc1 6448d2470e
commit 6624db4854
1 changed files with 14 additions and 0 deletions
--- a/services/core/java/com/android/server/logcat/LogcatManagerService.java
+++ b/services/core/java/com/android/server/logcat/LogcatManagerService.java
@@ -329,6 +329,20 @@ public final class LogcatManagerService extends SystemService {

            if (mStart) {

+                ActivityManagerInternal ami = LocalServices.getService(
+                        ActivityManagerInternal.class);
+                boolean isCallerInstrumented = ami.isUidCurrentlyInstrumented(mUid);
+
+                // The instrumented apks only run for testing, so we don't check user permission.
+                if (isCallerInstrumented) {
+                    try {
+                        getLogdService().approve(mUid, mGid, mPid, mFd);
+                    } catch (RemoteException e) {
+                        e.printStackTrace();
+                    }
+                    return;
+                }
+
                // TODO Temporarily approve all the requests to unblock testing failures.
                try {
                    getLogdService().approve(mUid, mGid, mPid, mFd);