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

Merge "Move bugreport storage enabling into OS."

Browse Source
This commit is contained in:
Jeff Sharkey
2018-02-03 23:41:16 +00:00
committed by Android (Google) Code Review
parent d35484f531 24f1843677
commit bc059cf252
2 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/development/BugReportInPowerPreferenceController.java
View File

@@ -18,7 +18,6 @@ package com.android.settings.development;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager;
import android.os.UserManager; import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
import android.support.annotation.VisibleForTesting; import android.support.annotation.VisibleForTesting;
@@ -28,7 +27,6 @@ import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.wrapper.PackageManagerWrapper;
public class BugReportInPowerPreferenceController extends public class BugReportInPowerPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
@@ -36,22 +34,17 @@ public class BugReportInPowerPreferenceController extends
private static final String KEY_BUGREPORT_IN_POWER = "bugreport_in_power"; private static final String KEY_BUGREPORT_IN_POWER = "bugreport_in_power";
@VisibleForTesting
static final ComponentName COMPONENT_NAME = new ComponentName("com.android.shell",
"com.android.shell.BugreportStorageProvider");
@VisibleForTesting @VisibleForTesting
static int SETTING_VALUE_ON = 1; static int SETTING_VALUE_ON = 1;
@VisibleForTesting @VisibleForTesting
static int SETTING_VALUE_OFF = 0; static int SETTING_VALUE_OFF = 0;
private final PackageManagerWrapper mPackageManager;
private final UserManager mUserManager; private final UserManager mUserManager;
private SwitchPreference mPreference; private SwitchPreference mPreference;
public BugReportInPowerPreferenceController(Context context) { public BugReportInPowerPreferenceController(Context context) {
super(context); super(context);
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
mPackageManager = new PackageManagerWrapper(context.getPackageManager());
} }
@Override @Override
@@ -77,7 +70,6 @@ public class BugReportInPowerPreferenceController extends
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Global.BUGREPORT_IN_POWER_MENU, Settings.Global.BUGREPORT_IN_POWER_MENU,
isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF); isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
setBugreportStorageProviderStatus(isEnabled);
return true; return true;
} }
@@ -97,13 +89,6 @@ public class BugReportInPowerPreferenceController extends
protected void onDeveloperOptionsSwitchDisabled() { protected void onDeveloperOptionsSwitchDisabled() {
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF); Settings.Global.BUGREPORT_IN_POWER_MENU, SETTING_VALUE_OFF);
setBugreportStorageProviderStatus(false);
mPreference.setChecked(false); mPreference.setChecked(false);
} }
private void setBugreportStorageProviderStatus(boolean isEnabled) {
mPackageManager.setComponentEnabledSetting(COMPONENT_NAME,
isEnabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
: PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */);
}
} }

12
tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.development; package com.android.settings.development;
import static com.android.settings.development.BugReportInPowerPreferenceController.COMPONENT_NAME;
import static com.android.settings.development.BugReportInPowerPreferenceController import static com.android.settings.development.BugReportInPowerPreferenceController
.SETTING_VALUE_OFF; .SETTING_VALUE_OFF;
import static com.android.settings.development.BugReportInPowerPreferenceController import static com.android.settings.development.BugReportInPowerPreferenceController
@@ -30,7 +29,6 @@ import static org.mockito.Mockito.when;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager;
import android.os.UserManager; import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
import android.support.v14.preference.SwitchPreference; import android.support.v14.preference.SwitchPreference;
@@ -38,7 +36,6 @@ import android.support.v7.preference.PreferenceScreen;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -59,8 +56,6 @@ public class BugReportInPowerPreferenceControllerTest {
@Mock @Mock
private UserManager mUserManager; private UserManager mUserManager;
@Mock @Mock
private PackageManagerWrapper mPackageManager;
@Mock
private Context mContext; private Context mContext;
@Mock @Mock
private SwitchPreference mPreference; private SwitchPreference mPreference;
@@ -76,7 +71,6 @@ public class BugReportInPowerPreferenceControllerTest {
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
mController = new BugReportInPowerPreferenceController(mContext); mController = new BugReportInPowerPreferenceController(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
} }
@Test @Test
@@ -113,8 +107,6 @@ public class BugReportInPowerPreferenceControllerTest {
Settings.Global.BUGREPORT_IN_POWER_MENU, -1 /* default */); Settings.Global.BUGREPORT_IN_POWER_MENU, -1 /* default */);
assertThat(mode).isEqualTo(SETTING_VALUE_OFF); assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
verify(mPackageManager).setComponentEnabledSetting(COMPONENT_NAME,
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */);
} }
@Test @Test
@@ -127,8 +119,6 @@ public class BugReportInPowerPreferenceControllerTest {
Settings.Global.BUGREPORT_IN_POWER_MENU, -1 /* default */); Settings.Global.BUGREPORT_IN_POWER_MENU, -1 /* default */);
assertThat(mode).isEqualTo(SETTING_VALUE_ON); assertThat(mode).isEqualTo(SETTING_VALUE_ON);
verify(mPackageManager).setComponentEnabledSetting(COMPONENT_NAME,
PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0 /* flags */);
} }
@@ -167,7 +157,5 @@ public class BugReportInPowerPreferenceControllerTest {
assertThat(mode).isEqualTo(SETTING_VALUE_OFF); assertThat(mode).isEqualTo(SETTING_VALUE_OFF);
verify(mPreference).setChecked(false); verify(mPreference).setChecked(false);
verify(mPackageManager).setComponentEnabledSetting(COMPONENT_NAME,
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0 /* flags */);
} }
} }