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

Commit 6d678e44 authored by Olivier Gaillard's avatar Olivier Gaillard Committed by Automerger Merge Worker
Browse files

Merge "Only add logcat to dropbox entries on userdebug/eng builds" into... 

Merge "Only add logcat to dropbox entries on userdebug/eng builds" into udc-dev am: 8086da9d am: fecad34f

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



Change-Id: Ib37994c66f94fe061684b09d113a6be7d3e29dd1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4daa3530 fecad34f

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

+3 −1
Original line number Diff line number Diff line
@@ -9351,7 +9351,9 @@ public class ActivityManagerService extends IActivityManager.Stub 














                String logcatSetting = Settings.Global.ERROR_LOGCAT_PREFIX + dropboxTag;















                String maxBytesSetting = Settings.Global.MAX_ERROR_BYTES_PREFIX + dropboxTag;













                int lines = Settings.Global.getInt(mContext.getContentResolver(), logcatSetting, 0);













                int lines = Build.IS_USER













                        ? 0













                        : Settings.Global.getInt(mContext.getContentResolver(), logcatSetting, 0);















                int dropboxMaxSize = Settings.Global.getInt(















                        mContext.getContentResolver(), maxBytesSetting, DROPBOX_DEFAULT_MAX_SIZE);















                int maxDataFileSize = dropboxMaxSize - sb.length()