Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use the correct Smart Storage flag in SettingsLib." into pi-dev

Browse Source 
am: b8c9dace53

Change-Id: Id04613a0bbe6c2147a9fc176c5add96d12ed6d46
This commit is contained in:
Daniel Nishi
2019-02-01 13:16:06 -08:00
committed by android-build-merger
parent 1660db4818 b8c9dace53
commit 8970bc35e6
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SettingsLib/src/com/android/settingslib/Utils.java
View File

@@ -35,8 +35,8 @@ public class Utils {
private static final String CURRENT_MODE_KEY = "CURRENT_MODE"; private static final String CURRENT_MODE_KEY = "CURRENT_MODE";
private static final String NEW_MODE_KEY = "NEW_MODE"; private static final String NEW_MODE_KEY = "NEW_MODE";
@VisibleForTesting @VisibleForTesting
static final String STORAGE_MANAGER_SHOW_OPT_IN_PROPERTY = static final String STORAGE_MANAGER_ENABLED_PROPERTY =
"ro.storage_manager.show_opt_in"; "ro.storage_manager.enabled";
private static Signature[] sSystemSignature; private static Signature[] sSystemSignature;
private static String sPermissionControllerPackageName; private static String sPermissionControllerPackageName;
@@ -353,8 +353,7 @@ public class Utils {
public static boolean isStorageManagerEnabled(Context context) { public static boolean isStorageManagerEnabled(Context context) {
boolean isDefaultOn; boolean isDefaultOn;
try { try {
// Turn off by default if the opt-in was shown. isDefaultOn = SystemProperties.getBoolean(STORAGE_MANAGER_ENABLED_PROPERTY, false);
isDefaultOn = !SystemProperties.getBoolean(STORAGE_MANAGER_SHOW_OPT_IN_PROPERTY, true);
} catch (Resources.NotFoundException e) { } catch (Resources.NotFoundException e) {
isDefaultOn = false; isDefaultOn = false;
} }

4
packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java
View File

@@ -17,7 +17,7 @@ package com.android.settingslib;
import static android.Manifest.permission.WRITE_SECURE_SETTINGS; import static android.Manifest.permission.WRITE_SECURE_SETTINGS;
import static com.android.settingslib.Utils.STORAGE_MANAGER_SHOW_OPT_IN_PROPERTY; import static com.android.settingslib.Utils.STORAGE_MANAGER_ENABLED_PROPERTY;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.argThat;
@@ -160,7 +160,7 @@ public class UtilsTest {
@Test @Test
public void testIsStorageManagerEnabled_UsesSystemProperties() { public void testIsStorageManagerEnabled_UsesSystemProperties() {
SystemProperties.set(STORAGE_MANAGER_SHOW_OPT_IN_PROPERTY, "false"); SystemProperties.set(STORAGE_MANAGER_ENABLED_PROPERTY, "true");
assertThat(Utils.isStorageManagerEnabled(mContext)).isTrue(); assertThat(Utils.isStorageManagerEnabled(mContext)).isTrue();
} }