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

Commit 1b9988ff authored by Wenhao Wang's avatar Wenhao Wang Committed by Automerger Merge Worker
Browse files

Merge "Generate per-use prompt only when the process is foreground" into... 

Merge "Generate per-use prompt only when the process is foreground" into tm-dev am: e24c01a1 am: 11cda3d1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17765607



Change-Id: Ib10fbdacfd05cc545994f1e1769331997645bb0f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f12345e 11cda3d1

services/core/java/com/android/server/logcat/LogcatManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ public final class LogcatManagerService extends SystemService { 
                        .getUidProcessState(mUid);

                // If the process is foreground and we can retrieve the package name, show a dialog

                // for user consent

                if (procState <= ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE) {

                if (procState == ActivityManager.PROCESS_STATE_TOP) {

                    String packageName = getPackageName(mUid, mGid, mPid, mFd);

                    if (packageName != null) {

                        final Intent mIntent = createIntent(packageName, mUid, mGid, mPid, mFd);