From af437f6bf802bb9e5f55818c873ad3ba178c3fcd Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 13 Jan 2021 10:26:07 -0800
Subject: [PATCH] Drop the maximum recommended log size from 16MiB to 8MiB.

Now we compress logs, 16MiB is a *lot* of logging, often over 100MiB
when decompressed. This can cause trouble for tools (and their
corresponding timeouts) if they're expecting 16MiB to mean "less than
16MiB" rather than "about 10 times 16MiB".

This patch doesn't address the issue of devices that are already
configured too high, since it's not obvious that we reasonably can. A
user can set the system property themselves, and we have no way to
distinguish the two cases.

Bug: https://issuetracker.google.com/176959217
Test: treehugger
Change-Id: Iba92061b278c487c3dc9a98aa54f014dfb2ea1c9
---
 packages/SettingsLib/res/values/arrays.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/SettingsLib/res/values/arrays.xml b/packages/SettingsLib/res/values/arrays.xml
index c63cf06cf75c8..2b5e9cdc017d0 100644
--- a/packages/SettingsLib/res/values/arrays.xml
+++ b/packages/SettingsLib/res/values/arrays.xml
@@ -291,7 +291,7 @@
         <item>256K</item>
         <item>1M</item>
         <item>4M</item>
-        <item>16M</item>
+        <item>8M</item>
     </string-array>
 
     <!-- Titles for logd limit size lowram selection preference. [CHAR LIMIT=14] -->
@@ -309,7 +309,7 @@
         <item>262144</item>
         <item>1048576</item>
         <item>4194304</item>
-        <item>16777216</item>
+        <item>8388608</item>
     </string-array>
 
     <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=50]-->
@@ -319,7 +319,7 @@
         <item>256K per log buffer</item>
         <item>1M per log buffer</item>
         <item>4M per log buffer</item>
-        <item>16M per log buffer</item>
+        <item>8M per log buffer</item>
     </string-array>
 
     <!-- Values for logpersist state selection preference. -->