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

Commit b93bc065 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 udc-dev am: 8086da9d 

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



Change-Id: I56e8f5fe6fe3c2810d5052427e23c42ed411139b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8f89a9d 8086da9d

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

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
















                String logcatSetting = Settings.Global.ERROR_LOGCAT_PREFIX + dropboxTag;







                String logcatSetting = Settings.Global.ERROR_LOGCAT_PREFIX + dropboxTag;











                String maxBytesSetting = Settings.Global.MAX_ERROR_BYTES_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(







                int dropboxMaxSize = Settings.Global.getInt(











                        mContext.getContentResolver(), maxBytesSetting, DROPBOX_DEFAULT_MAX_SIZE);







                        mContext.getContentResolver(), maxBytesSetting, DROPBOX_DEFAULT_MAX_SIZE);











                int maxDataFileSize = dropboxMaxSize - sb.length()







                int maxDataFileSize = dropboxMaxSize - sb.length()