Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I56e8f5fe6fe3c2810d5052427e23c42ed411139b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Olivier Gaillard
2023-03-16 17:13:28 +00:00
committed by Automerger Merge Worker
parent f8f89a9d12 8086da9d10
commit b93bc06518
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityManagerService.java
View File

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