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

am c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev

Browse Source 
* commit 'c2c9d5bde11113d3fc86f1ea25b41e7446e3d833':
  Selectively enable bugreport in power menu.
This commit is contained in:
Jeff Sharkey
2012-10-29 16:36:38 -07:00
committed by Android Git Automerger
parent 5ba8c670a9 c2c9d5bde1
commit ea6f505156
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,6 +94,7 @@ public class DevelopmentSettings extends PreferenceFragment
private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password"; private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
private static final String HARDWARE_UI_PROPERTY = "persist.sys.ui.hw"; private static final String HARDWARE_UI_PROPERTY = "persist.sys.ui.hw";
private static final String MSAA_PROPERTY = "debug.egl.force_msaa"; private static final String MSAA_PROPERTY = "debug.egl.force_msaa";
private static final String BUGREPORT = "bugreport";
private static final String BUGREPORT_IN_POWER_KEY = "bugreport_in_power"; private static final String BUGREPORT_IN_POWER_KEY = "bugreport_in_power";
private static final String OPENGL_TRACES_PROPERTY = "debug.egl.trace"; private static final String OPENGL_TRACES_PROPERTY = "debug.egl.trace";
@@ -144,6 +145,7 @@ public class DevelopmentSettings extends PreferenceFragment
private boolean mDontPokeProperties; private boolean mDontPokeProperties;
private CheckBoxPreference mEnableAdb; private CheckBoxPreference mEnableAdb;
private Preference mBugreport;
private CheckBoxPreference mBugreportInPower; private CheckBoxPreference mBugreportInPower;
private CheckBoxPreference mKeepScreenOn; private CheckBoxPreference mKeepScreenOn;
private CheckBoxPreference mEnforceReadExternal; private CheckBoxPreference mEnforceReadExternal;
@@ -203,6 +205,7 @@ public class DevelopmentSettings extends PreferenceFragment
addPreferencesFromResource(R.xml.development_prefs); addPreferencesFromResource(R.xml.development_prefs);
mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB); mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB);
mBugreport = findPreference(BUGREPORT);
mBugreportInPower = findAndInitCheckboxPref(BUGREPORT_IN_POWER_KEY); mBugreportInPower = findAndInitCheckboxPref(BUGREPORT_IN_POWER_KEY);
mKeepScreenOn = findAndInitCheckboxPref(KEEP_SCREEN_ON); mKeepScreenOn = findAndInitCheckboxPref(KEEP_SCREEN_ON);
mEnforceReadExternal = findAndInitCheckboxPref(ENFORCE_READ_EXTERNAL); mEnforceReadExternal = findAndInitCheckboxPref(ENFORCE_READ_EXTERNAL);
@@ -417,6 +420,7 @@ public class DevelopmentSettings extends PreferenceFragment
updateAppProcessLimitOptions(); updateAppProcessLimitOptions();
updateShowAllANRsOptions(); updateShowAllANRsOptions();
updateVerifyAppsOverUsbOptions(); updateVerifyAppsOverUsbOptions();
updateBugreportOptions();
} }
private void resetDangerousOptions() { private void resetDangerousOptions() {
@@ -548,6 +552,25 @@ public class DevelopmentSettings extends PreferenceFragment
Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1) > 0; Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1) > 0;
} }
private void updateBugreportOptions() {
if ("user".equals(Build.TYPE)) {
final ContentResolver resolver = getActivity().getContentResolver();
final boolean adbEnabled = Settings.Global.getInt(
resolver, Settings.Global.ADB_ENABLED, 0) != 0;
if (adbEnabled) {
mBugreport.setEnabled(true);
mBugreportInPower.setEnabled(true);
} else {
mBugreport.setEnabled(false);
mBugreportInPower.setEnabled(false);
mBugreportInPower.setChecked(false);
Settings.Secure.putInt(resolver, Settings.Secure.BUGREPORT_IN_POWER_MENU, 0);
}
} else {
mBugreportInPower.setEnabled(true);
}
}
// Returns the current state of the system property that controls // Returns the current state of the system property that controls
// strictmode flashes. One of: // strictmode flashes. One of:
// 0: not explicitly set one way or another // 0: not explicitly set one way or another
@@ -988,6 +1011,7 @@ public class DevelopmentSettings extends PreferenceFragment
Settings.Global.ADB_ENABLED, 0); Settings.Global.ADB_ENABLED, 0);
mVerifyAppsOverUsb.setEnabled(false); mVerifyAppsOverUsb.setEnabled(false);
mVerifyAppsOverUsb.setChecked(false); mVerifyAppsOverUsb.setChecked(false);
updateBugreportOptions();
} }
} else if (preference == mBugreportInPower) { } else if (preference == mBugreportInPower) {
Settings.Secure.putInt(getActivity().getContentResolver(), Settings.Secure.putInt(getActivity().getContentResolver(),
@@ -1100,6 +1124,7 @@ public class DevelopmentSettings extends PreferenceFragment
Settings.Global.ADB_ENABLED, 1); Settings.Global.ADB_ENABLED, 1);
mVerifyAppsOverUsb.setEnabled(true); mVerifyAppsOverUsb.setEnabled(true);
updateVerifyAppsOverUsbOptions(); updateVerifyAppsOverUsbOptions();
updateBugreportOptions();
} else { } else {
// Reset the toggle // Reset the toggle
mEnableAdb.setChecked(false); mEnableAdb.setChecked(false);