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

Commit 8086da9d authored by Olivier Gaillard's avatar Olivier Gaillard Committed by Android (Google) Code Review
Browse files

Merge "Only add logcat to dropbox entries on userdebug/eng builds" into udc-dev

parents e32211c1 3c71780d

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()