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

Move bugreport storage enabling into OS.

Browse Source 
It's convoluted to enable/disable bugreport storage based on the
"power menu" shortcut, and it's frustrating for dogfooders to have
to manually cycle this setting once to enable the provider.

So move the enable/disable logic directly into the OS, toggle it
when the broader DEVELOPMENT_SETTINGS_ENABLED changes, and update
to match state at device boot.

Test: builds, boots
Bug: 32540478
Change-Id: I8721dfbfc1dc2e19adb9cb5588f6b35f2872da9d
This commit is contained in:
Jeff Sharkey
2018-02-03 13:27:03 -07:00
parent 36952523bb
commit 24f1843677
2 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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