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

Commit 8970bc35 authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

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

am: b8c9dace

Change-Id: Id04613a0bbe6c2147a9fc176c5add96d12ed6d46
parents 1660db48 b8c9dace

packages/SettingsLib/src/com/android/settingslib/Utils.java

+3 −4
Original line number Original line Diff line number Diff line
@@ -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;

        }

        }

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -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();

    }

    }