From 44cf6b73b673cb978f5f2cdb6d3dee4a707f22d8 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Tue, 17 Jun 2014 09:48:51 -0700
Subject: [PATCH 1/3] Settings: logd: increase summary field size to 30

Bug: 15661901
Bug: 15661903
Bug: 15644939
Bug: 15644940
Bug: 15662401
Bug: 15665444
Bug: 15668253
Change-Id: Ib15917bfdd4a1028d5d9d8ac4f7afe772a0ba77b
---
 res/values/arrays.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7e094d4c0a4..d866e9d6005 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -909,7 +909,7 @@
         <item>16777216</item>
     </string-array>
 
-    <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=19]-->
+    <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=30]-->
     <string-array name="select_logd_size_summaries" >
         <item>64K per log buffer</item>
         <item>256K per log buffer</item>

From 20f1b207d0bff244792c5b4b0026afeda64d9c85 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Tue, 17 Jun 2014 09:56:30 -0700
Subject: [PATCH 2/3] Settings: logd: increase dialog title field size to 59

Bug: 15660860
Change-Id: I54d8255a1fc28ff41e8d8adc693d2e66ff4cc311
---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7f4293b2a2a..ae53227cfd2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3168,7 +3168,7 @@
     <string name="wifi_display_certification_summary">Show options for wireless display certification</string>
     <!-- UI debug setting: limit size of Android logger buffers -->
     <string name="select_logd_size_title">Logger buffer sizes</string>
-    <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=34] -->
+    <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
     <string name="select_logd_size_dialog_title">Select Logger sizes per log buffer</string>
     <!-- Setting Checkbox title whether to allow mock locations -->
     <string name="allow_mock_location">Allow mock locations</string>

From 07d976e431527add98c951065a58ee63de048a16 Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Tue, 17 Jun 2014 09:33:03 -0700
Subject: [PATCH 3/3] Settings: crashing when turning ON<>OFF developer option.
 DO NOT MERGE

- prevent NPE
- define default value (to 256K)
- add more logs for showing value which has been set or any exception

Bug: 15687210
Change-Id: I8f067f14d81ee56631d1ad74b91b5ede26cae125
---
 src/com/android/settings/DevelopmentSettings.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index a16f8b687f8..8cda9bb661a 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -150,6 +150,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
 
     private static final int RESULT_DEBUG_APP = 1000;
 
+    private static String DEFAULT_LOG_RING_BUFFER_SIZE_IN_BYTES = "262144"; // 256K
+
     private IWindowManager mWindowManager;
     private IBackupManager mBackupManager;
     private DevicePolicyManager mDpm;
@@ -993,12 +995,16 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
     }
 
     private void writeLogdSizeOption(Object newValue) {
-        SystemProperties.set(SELECT_LOGD_SIZE_PROPERTY, newValue.toString());
+        final String size = (newValue != null) ?
+                newValue.toString() : DEFAULT_LOG_RING_BUFFER_SIZE_IN_BYTES;
+        SystemProperties.set(SELECT_LOGD_SIZE_PROPERTY, size);
         pokeSystemProperties();
         try {
-            Process p = Runtime.getRuntime().exec("logcat -b all -G " + newValue.toString());
-            int status = p.waitFor();
+            Process p = Runtime.getRuntime().exec("logcat -b all -G " + size);
+            p.waitFor();
+            Log.i(TAG, "Logcat ring buffer sizes set to: " + size);
         } catch (Exception e) {
+            Log.w(TAG, "Cannot set logcat ring buffer sizes", e);
         }
         updateLogdSizeValues();
     }