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

Commit 744a9d13 authored by Inseob Kim's avatar Inseob Kim Committed by android-build-merger
Browse files

Revert "Revert "Schematize vold system properties"" 

am: 97b0fe0a

Change-Id: I8b6e78df6e31500df448addb82bed9d2c11c8fec
parents e92deab3 97b0fe0a

src/com/android/settings/CryptKeeper.java

+5 −6
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ import android.os.Message; 
import android.os.PowerManager;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.storage.IStorageManager;

import android.os.storage.StorageManager;

import android.provider.Settings;

import android.sysprop.VoldProperties;

import android.telecom.TelecomManager;

import android.telephony.TelephonyManager;

import android.text.Editable;
@@ -400,7 +400,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList 
        super.onCreate(savedInstanceState);



        // If we are not encrypted or encrypting, get out quickly.

        final String state = SystemProperties.get("vold.decrypt");

        final String state = VoldProperties.decrypt().orElse("");

        if (!isDebugView() && ("".equals(state) || DECRYPT_STATE.equals(state))) {

            disableCryptKeeperComponent(this);

            // Typically CryptKeeper is launched as the home app.  We didn't
@@ -468,7 +468,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList 
            return;

        }



        final String progress = SystemProperties.get("vold.encrypt_progress");

        final String progress = VoldProperties.encrypt_progress().orElse("");

        if (!"".equals(progress) || isDebugView(FORCE_VIEW_PROGRESS)) {

            setContentView(R.layout.crypt_keeper_progress);

            encryptionProgressInit();
@@ -636,7 +636,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList 
    }



    private void updateProgress() {

        final String state = SystemProperties.get("vold.encrypt_progress");

        final String state = VoldProperties.encrypt_progress().orElse("");



        if ("error_partially_encrypted".equals(state)) {

            showFactoryReset(false);
@@ -657,8 +657,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList 
        // Now try to get status as time remaining and replace as appropriate

        Log.v(TAG, "Encryption progress: " + progress);

        try {

            final String timeProperty = SystemProperties.get("vold.encrypt_time_remaining");

            int time = Integer.parseInt(timeProperty);

            int time = VoldProperties.encrypt_time_remaining().get();

            if (time >= 0) {

                // Round up to multiple of 10 - this way display is less jerky

                time = (time + 9) / 10 * 10;

src/com/android/settings/MasterClear.java

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.provider.Settings;

import androidx.annotation.VisibleForTesting;

import android.sysprop.VoldProperties;

import android.telephony.euicc.EuiccManager;

import android.text.TextUtils;

import android.util.Log;
@@ -404,7 +405,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL 
    }



    private boolean isExtStorageEncrypted() {

        String state = SystemProperties.get("vold.decrypt");

        String state = VoldProperties.decrypt().orElse("");

        return !"".equals(state);

    }