PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Settings: trampoline persist.logd.logpersistd to logd.logpersistd\"

Browse Source 
am: a1b40f0267

Change-Id: I38e4c7756a2ea617053656558d8223458d898a28
This commit is contained in:
Mark Salyzyn
2016-07-13 18:02:20 +00:00
committed by android-build-merger
parent bd900c98ef a1b40f0267
commit 455006c9ca
1 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/com/android/settings/DevelopmentSettings.java
View File

@@ -173,10 +173,13 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private static final String SELECT_LOGD_OFF_SIZE_MARKER_VALUE = "32768"; private static final String SELECT_LOGD_OFF_SIZE_MARKER_VALUE = "32768";
private static final String SELECT_LOGPERSIST_KEY = "select_logpersist"; private static final String SELECT_LOGPERSIST_KEY = "select_logpersist";
private static final String SELECT_LOGPERSIST_PROPERTY = "persist.logd.logpersistd"; private static final String SELECT_LOGPERSIST_PROPERTY = "persist.logd.logpersistd";
private static final String ACTUAL_LOGPERSIST_PROPERTY = "logd.logpersistd";
private static final String SELECT_LOGPERSIST_PROPERTY_SERVICE = "logcatd"; private static final String SELECT_LOGPERSIST_PROPERTY_SERVICE = "logcatd";
private static final String SELECT_LOGPERSIST_PROPERTY_CLEAR = "clear"; private static final String SELECT_LOGPERSIST_PROPERTY_CLEAR = "clear";
private static final String SELECT_LOGPERSIST_PROPERTY_STOP = "stop"; private static final String SELECT_LOGPERSIST_PROPERTY_STOP = "stop";
private static final String SELECT_LOGPERSIST_PROPERTY_BUFFER = "persist.logd.logpersistd.buffer"; private static final String SELECT_LOGPERSIST_PROPERTY_BUFFER = "persist.logd.logpersistd.buffer";
private static final String ACTUAL_LOGPERSIST_PROPERTY_BUFFER = "logd.logpersistd.buffer";
private static final String ACTUAL_LOGPERSIST_PROPERTY_ENABLE = "logd.logpersistd.enable";
private static final String WIFI_DISPLAY_CERTIFICATION_KEY = "wifi_display_certification"; private static final String WIFI_DISPLAY_CERTIFICATION_KEY = "wifi_display_certification";
private static final String WIFI_VERBOSE_LOGGING_KEY = "wifi_verbose_logging"; private static final String WIFI_VERBOSE_LOGGING_KEY = "wifi_verbose_logging";
@@ -1474,13 +1477,17 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
String currentValue = SystemProperties.get(SELECT_LOGD_SIZE_PROPERTY); String currentValue = SystemProperties.get(SELECT_LOGD_SIZE_PROPERTY);
if ((currentTag != null) && currentTag.startsWith(SELECT_LOGD_TAG_SILENCE)) { if ((currentTag != null) && currentTag.startsWith(SELECT_LOGD_TAG_SILENCE)) {
currentValue = SELECT_LOGD_OFF_SIZE_MARKER_VALUE; currentValue = SELECT_LOGD_OFF_SIZE_MARKER_VALUE;
if (mLogpersist != null) { }
writeLogpersistOption(null, true); if (mLogpersist != null) {
mLogpersist.setEnabled(false); String currentLogpersistEnable
} = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY_ENABLE);
} else { if ((currentLogpersistEnable == null)
if ((mLogpersist != null) && mLastEnabledState) { || !currentLogpersistEnable.equals("true")
mLogpersist.setEnabled(true); || currentValue.equals(SELECT_LOGD_OFF_SIZE_MARKER_VALUE)) {
writeLogpersistOption(null, true);
mLogpersist.setEnabled(false);
} else if (mLastEnabledState) {
mLogpersist.setEnabled(true);
} }
} }
if ((currentValue == null) || (currentValue.length() == 0)) { if ((currentValue == null) || (currentValue.length() == 0)) {
@@ -1554,11 +1561,11 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
if (mLogpersist == null) { if (mLogpersist == null) {
return; return;
} }
String currentValue = SystemProperties.get(SELECT_LOGPERSIST_PROPERTY); String currentValue = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY);
if (currentValue == null) { if (currentValue == null) {
currentValue = ""; currentValue = "";
} }
String currentBuffers = SystemProperties.get(SELECT_LOGPERSIST_PROPERTY_BUFFER); String currentBuffers = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY_BUFFER);
if ((currentBuffers == null) || (currentBuffers.length() == 0)) { if ((currentBuffers == null) || (currentBuffers.length() == 0)) {
currentBuffers = "all"; currentBuffers = "all";
} }
@@ -1590,7 +1597,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mLogpersistCleared = false; mLogpersistCleared = false;
} else if (!mLogpersistCleared) { } else if (!mLogpersistCleared) {
// would File.delete() directly but need to switch uid/gid to access // would File.delete() directly but need to switch uid/gid to access
SystemProperties.set(SELECT_LOGPERSIST_PROPERTY, SELECT_LOGPERSIST_PROPERTY_CLEAR); SystemProperties.set(ACTUAL_LOGPERSIST_PROPERTY, SELECT_LOGPERSIST_PROPERTY_CLEAR);
pokeSystemProperties(); pokeSystemProperties();
mLogpersistCleared = true; mLogpersistCleared = true;
} }
@@ -1598,11 +1605,25 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private void setLogpersistOff(boolean update) { private void setLogpersistOff(boolean update) {
SystemProperties.set(SELECT_LOGPERSIST_PROPERTY_BUFFER, ""); SystemProperties.set(SELECT_LOGPERSIST_PROPERTY_BUFFER, "");
SystemProperties.set(SELECT_LOGPERSIST_PROPERTY, // deal with trampoline of empty properties
SystemProperties.set(ACTUAL_LOGPERSIST_PROPERTY_BUFFER, "");
SystemProperties.set(SELECT_LOGPERSIST_PROPERTY, "");
SystemProperties.set(ACTUAL_LOGPERSIST_PROPERTY,
update ? "" : SELECT_LOGPERSIST_PROPERTY_STOP); update ? "" : SELECT_LOGPERSIST_PROPERTY_STOP);
pokeSystemProperties(); pokeSystemProperties();
if (update) { if (update) {
updateLogpersistValues(); updateLogpersistValues();
} else {
for (int i = 0; i < 3; i++) {
String currentValue = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY);
if ((currentValue == null) || currentValue.equals("")) {
break;
}
try {
Thread.sleep(100);
} catch (InterruptedException e) {
}
}
} }
} }
@@ -1621,8 +1642,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mLogpersistCleared = false; mLogpersistCleared = false;
} else if (!mLogpersistCleared) { } else if (!mLogpersistCleared) {
// if transitioning from on to off, pop up an are you sure? // if transitioning from on to off, pop up an are you sure?
String currentValue = SystemProperties.get(SELECT_LOGPERSIST_PROPERTY); String currentValue = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY);
if ((currentValue != null) && (currentValue.length() != 0)) { if ((currentValue != null) &&
currentValue.equals(SELECT_LOGPERSIST_PROPERTY_SERVICE)) {
if (mLogpersistClearDialog != null) dismissDialogs(); if (mLogpersistClearDialog != null) dismissDialogs();
mLogpersistClearDialog = new AlertDialog.Builder(getActivity()).setMessage( mLogpersistClearDialog = new AlertDialog.Builder(getActivity()).setMessage(
getActivity().getResources().getString( getActivity().getResources().getString(
@@ -1639,13 +1661,24 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
return; return;
} }
String currentBuffer = SystemProperties.get(SELECT_LOGPERSIST_PROPERTY_BUFFER); String currentBuffer = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY_BUFFER);
if ((currentBuffer != null) && !currentBuffer.equals(newValue.toString())) { if ((currentBuffer != null) && !currentBuffer.equals(newValue.toString())) {
setLogpersistOff(false); setLogpersistOff(false);
} }
SystemProperties.set(SELECT_LOGPERSIST_PROPERTY_BUFFER, newValue.toString()); SystemProperties.set(SELECT_LOGPERSIST_PROPERTY_BUFFER, newValue.toString());
SystemProperties.set(SELECT_LOGPERSIST_PROPERTY, SELECT_LOGPERSIST_PROPERTY_SERVICE); SystemProperties.set(SELECT_LOGPERSIST_PROPERTY, SELECT_LOGPERSIST_PROPERTY_SERVICE);
pokeSystemProperties(); pokeSystemProperties();
for (int i = 0; i < 3; i++) {
String currentValue = SystemProperties.get(ACTUAL_LOGPERSIST_PROPERTY);
if ((currentValue != null)
&& currentValue.equals(SELECT_LOGPERSIST_PROPERTY_SERVICE)) {
break;
}
try {
Thread.sleep(100);
} catch (InterruptedException e) {
}
}
updateLogpersistValues(); updateLogpersistValues();
} }