Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5213531f authored by Ryo Hashimoto's avatar Ryo Hashimoto
Browse files

Enable BugreportStorageProvider when bug report is enabled 

BUG=18070208

Change-Id: Ica4eb8e9b1c1a3c228daf8d868642f1288c1d6ed
parent c24adcdf

src/com/android/settings/DevelopmentSettings.java

+13 −0
Original line number Original line Diff line number Diff line
@@ -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;
@@ -738,6 +739,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(
@@ -745,14 +749,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);

        }

        }

    }

    }