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

Merge "Enable BugreportStorageProvider when bug report is enabled"

Browse Source
This commit is contained in:
Ryo Hashimoto
2015-04-09 10:26:52 +00:00
committed by Android (Google) Code Review
parent c2ab934117 5213531f30
commit fa54606dc7
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ import android.app.admin.DevicePolicyManager;
import android.app.backup.IBackupManager; import android.app.backup.IBackupManager;
import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@@ -751,6 +752,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
} }
private void updateBugreportOptions() { private void updateBugreportOptions() {
final ComponentName bugreportStorageProviderComponentName =
new ComponentName("com.android.shell",
"com.android.shell.BugreportStorageProvider");
if ("user".equals(Build.TYPE)) { if ("user".equals(Build.TYPE)) {
final ContentResolver resolver = getActivity().getContentResolver(); final ContentResolver resolver = getActivity().getContentResolver();
final boolean adbEnabled = Settings.Global.getInt( final boolean adbEnabled = Settings.Global.getInt(
@@ -758,14 +762,23 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
if (adbEnabled) { if (adbEnabled) {
mBugreport.setEnabled(true); mBugreport.setEnabled(true);
mBugreportInPower.setEnabled(true); mBugreportInPower.setEnabled(true);
getPackageManager().setComponentEnabledSetting(
bugreportStorageProviderComponentName,
PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
} else { } else {
mBugreport.setEnabled(false); mBugreport.setEnabled(false);
mBugreportInPower.setEnabled(false); mBugreportInPower.setEnabled(false);
mBugreportInPower.setChecked(false); mBugreportInPower.setChecked(false);
Settings.Secure.putInt(resolver, Settings.Secure.BUGREPORT_IN_POWER_MENU, 0); Settings.Secure.putInt(resolver, Settings.Secure.BUGREPORT_IN_POWER_MENU, 0);
getPackageManager().setComponentEnabledSetting(
bugreportStorageProviderComponentName,
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
} }
} else { } else {
mBugreportInPower.setEnabled(true); mBugreportInPower.setEnabled(true);
getPackageManager().setComponentEnabledSetting(
bugreportStorageProviderComponentName,
PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
} }
} }