From 3c71780d3ce2f40c7d0501f44433b533cac94c6b Mon Sep 17 00:00:00 2001 From: Olivier Gaillard Date: Fri, 24 Feb 2023 09:23:39 +0000 Subject: [PATCH] Only add logcat to dropbox entries on userdebug/eng builds Change-Id: I8250aa08afb02fc9c92a32b46fbae2b2d86019f7 Bug: 214314376 Test: unit tests --- .../java/com/android/server/am/ActivityManagerService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 755019684da6f..b4e75e193b655 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -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()