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

Merge "Minor changes on bug report settings on 'Developer options'."

Browse Source
This commit is contained in:
Felipe Leme
2015-11-03 22:30:22 +00:00
committed by Android (Google) Code Review
parent 74dbcb091b 27df7a36fc
commit 77c69c5a22
1 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -594,7 +594,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
== PackageManager.COMPONENT_ENABLED_STATE_ENABLED); == PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
} }
updateSwitchPreference(mBugreportInPower, Settings.Secure.getInt(cr, updateSwitchPreference(mBugreportInPower, Settings.Secure.getInt(cr,
Settings.Secure.BUGREPORT_IN_POWER_MENU, 0) != 0); Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0);
updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr, updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr,
Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0); Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
updateSwitchPreference(mBtHciSnoopLog, Settings.Secure.getInt(cr, updateSwitchPreference(mBtHciSnoopLog, Settings.Secure.getInt(cr,
@@ -858,34 +858,19 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
} }
private void updateBugreportOptions() { private void updateBugreportOptions() {
final ComponentName bugreportStorageProviderComponentName = mBugreport.setEnabled(true);
new ComponentName("com.android.shell", mBugreportInPower.setEnabled(true);
"com.android.shell.BugreportStorageProvider"); setBugreportStorageProviderStatus();
if ("user".equals(Build.TYPE)) { }
final ContentResolver resolver = getActivity().getContentResolver();
final boolean adbEnabled = Settings.Global.getInt( private void setBugreportStorageProviderStatus() {
resolver, Settings.Global.ADB_ENABLED, 0) != 0; final ComponentName componentName = new ComponentName("com.android.shell",
if (adbEnabled) { "com.android.shell.BugreportStorageProvider");
mBugreport.setEnabled(true); final boolean enabled = mBugreportInPower.isChecked();
mBugreportInPower.setEnabled(true); getPackageManager().setComponentEnabledSetting(componentName,
getPackageManager().setComponentEnabledSetting( enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
bugreportStorageProviderComponentName, : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0); 0);
} else {
mBugreport.setEnabled(false);
mBugreportInPower.setEnabled(false);
mBugreportInPower.setChecked(false);
Settings.Secure.putInt(resolver, Settings.Secure.BUGREPORT_IN_POWER_MENU, 0);
getPackageManager().setComponentEnabledSetting(
bugreportStorageProviderComponentName,
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
}
} else {
mBugreportInPower.setEnabled(true);
getPackageManager().setComponentEnabledSetting(
bugreportStorageProviderComponentName,
PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
}
} }
// Returns the current state of the system property that controls // Returns the current state of the system property that controls
@@ -1624,8 +1609,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
: PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0); : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
} else if (preference == mBugreportInPower) { } else if (preference == mBugreportInPower) {
Settings.Secure.putInt(getActivity().getContentResolver(), Settings.Secure.putInt(getActivity().getContentResolver(),
Settings.Secure.BUGREPORT_IN_POWER_MENU, Settings.Global.BUGREPORT_IN_POWER_MENU,
mBugreportInPower.isChecked() ? 1 : 0); mBugreportInPower.isChecked() ? 1 : 0);
setBugreportStorageProviderStatus();
} else if (preference == mKeepScreenOn) { } else if (preference == mKeepScreenOn) {
Settings.Global.putInt(getActivity().getContentResolver(), Settings.Global.putInt(getActivity().getContentResolver(),
Settings.Global.STAY_ON_WHILE_PLUGGED_IN, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,